diff options
Diffstat (limited to 'connectivity')
822 files changed, 7386 insertions, 7386 deletions
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java index af8bced79837..a10f07dbc4f9 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java @@ -1,7 +1,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/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java index fa14c7f5649a..214f8fd5ecce 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java @@ -1,7 +1,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,29 +46,29 @@ public class NativeInputStreamHelper extends java.io.InputStream{ this.key = key; in = new StorageNativeInputStream(key,file); } - + public int read() throws java.io.IOException { return in.read(key,file); } - + public int read(byte[] b, int off, int len) throws java.io.IOException { return in.read(key,file,b,off,len); } - + public void close() throws java.io.IOException { in.close(key,file); } - + public long skip(long n) throws java.io.IOException { return in.skip(key,file,n); } - + public int available() throws java.io.IOException { return in.available(key,file); } - + public int read(byte[] b) throws java.io.IOException { return in.read(key,file,b); } - + } diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java index 451dc6b1e325..11ab3e61c502 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java @@ -1,7 +1,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/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java index cc4faaa3cedf..4f7b3d04dc88 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java @@ -11,7 +11,7 @@ package com.sun.star.sdbcx.comp.hsqldb; * @author oj93728 */ public class NativeOutputStreamHelper extends java.io.OutputStream{ - + private String key; private String file; private StorageNativeOutputStream out; @@ -21,27 +21,27 @@ public class NativeOutputStreamHelper extends java.io.OutputStream{ this.key = key; out = new StorageNativeOutputStream(file,key); } - + public void write(byte[] b, int off, int len) throws java.io.IOException{ out.write(key,file,b, off, len); } - + public void write(byte[] b) throws java.io.IOException{ out.write(key,file,b); } - + public void close() throws java.io.IOException{ out.close(key,file); } - + public void write(int b) throws java.io.IOException{ out.write(key,file,b); } - + public void flush() throws java.io.IOException{ out.flush(key,file); } - + public void sync() throws java.io.IOException{ out.sync(key,file); } diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java index 276119e947b6..6e2bc1099dff 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java @@ -1,7 +1,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 @@ package com.sun.star.sdbcx.comp.hsqldb; public class NativeStorageAccess { static { NativeLibraries.load(); } - + public static final int READ = 1; public static final int SEEKABLE = 2; public static final int SEEKABLEREAD = 3; @@ -52,29 +52,29 @@ public class NativeStorageAccess { try { int mode = NativeStorageAccess.SEEKABLEREAD; if ( _mode.equals("rw") ) - mode = NativeStorageAccess.READWRITE | NativeStorageAccess.SEEKABLE; + mode = NativeStorageAccess.READWRITE | NativeStorageAccess.SEEKABLE; openStream(name, (String)key, mode); - } catch(Exception e){ + } catch(Exception e){ throw new java.io.IOException(); } } public native void openStream(String name,String key, int mode); public native void close(String name,String key) throws java.io.IOException; - + public native long getFilePointer(String name,String key) throws java.io.IOException; - + public native long length(String name,String key) throws java.io.IOException; - + public native int read(String name,String key) throws java.io.IOException; - + public native int read(String name,String key,byte[] b, int off, int len) throws java.io.IOException; - + public native int readInt(String name,String key) throws java.io.IOException; - + public native void seek(String name,String key,long position) throws java.io.IOException; - + public native void write(String name,String key,byte[] b, int offset, int length) throws java.io.IOException; - + public native void writeInt(String name,String key,int v) throws java.io.IOException; } diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java index 6797ab39290b..8a1af5191913 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java @@ -1,7 +1,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/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java index 4e24cd4c9385..536e72d0c8bf 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java @@ -1,7 +1,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/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java index 2ac4d2dbede8..f72d397ba845 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java @@ -1,7 +1,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,12 +42,12 @@ public class StorageNativeInputStream { /** Creates a new instance of StorageNativeInputStream */ public StorageNativeInputStream(String key,String _file) { openStream(key,_file, NativeStorageAccess.READ); - } + } public native void openStream(String key,String name, int mode); public native int read(String key,String name) throws java.io.IOException; - public native int read(String key,String name,byte[] b, int off, int len) throws java.io.IOException; - public native void close(String key,String name) throws java.io.IOException; - public native long skip(String key,String name,long n) throws java.io.IOException; - public native int available(String key,String name) throws java.io.IOException; + public native int read(String key,String name,byte[] b, int off, int len) throws java.io.IOException; + public native void close(String key,String name) throws java.io.IOException; + public native long skip(String key,String name,long n) throws java.io.IOException; + public native int available(String key,String name) throws java.io.IOException; public native int read(String key,String name,byte[] b) throws java.io.IOException; } diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java index 6b9a4db50153..a95ef2ac5d4e 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java @@ -22,7 +22,7 @@ public class StorageNativeOutputStream { key = _key; openStream(name, (String)key, NativeStorageAccess.WRITE | NativeStorageAccess.TRUNCATE); } - + public native void openStream(String name,String key, int mode); /** * Writes <code>len</code> bytes from the specified byte array @@ -54,7 +54,7 @@ public class StorageNativeOutputStream { * stream is closed. */ public native void write(String key,String _file,byte[] b, int off, int len) throws java.io.IOException; - + /** * Writes <code>b.length</code> bytes from the specified byte array * to this output stream. The general contract for <code>write(b)</code> @@ -66,7 +66,7 @@ public class StorageNativeOutputStream { * @see java.io.OutputStream#write(byte[], int, int) */ public native void write(String key,String _file,byte[] b) throws java.io.IOException; - + /** * Closes this output stream and releases any system resources * associated with this stream. The general contract of <code>close</code> @@ -80,7 +80,7 @@ public class StorageNativeOutputStream { * @exception IOException if an I/O error occurs. */ public native void close(String key,String _file) throws java.io.IOException; - + /** * Writes the specified byte to this output stream. The general * contract for <code>write</code> is that one byte is written @@ -99,7 +99,7 @@ public class StorageNativeOutputStream { * output stream has been closed. */ public native void write(String key,String _file,int b) throws java.io.IOException; - + /** * Flushes this output stream and forces any buffered output bytes * to be written out. The general contract of <code>flush</code> is @@ -115,11 +115,11 @@ public class StorageNativeOutputStream { * @exception IOException if an I/O error occurs. */ public native void flush(String key,String _file) throws java.io.IOException; - + /** * Force all system buffers to synchronize with the underlying * device. This method returns after all modified data and - * attributes have been written to the relevant device(s). + * attributes have been written to the relevant device(s). * * sync is meant to be used by code that requires physical * storage (such as a file) to be in a known state For @@ -134,10 +134,10 @@ public class StorageNativeOutputStream { * OutputStream.flush) before that data will be affected by sync. * * @exception IOException - * Thrown when the buffers cannot be flushed, - * or because the system cannot guarantee that all the - * buffers have been synchronized with physical media. + * Thrown when the buffers cannot be flushed, + * or because the system cannot guarantee that all the + * buffers have been synchronized with physical media. */ public native void sync(String key,String _file) throws java.io.IOException; - + } 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 diff --git a/connectivity/qa/connectivity/GeneralTest.java b/connectivity/qa/connectivity/GeneralTest.java index a69ac5c1048f..374f76cf7308 100644 --- a/connectivity/qa/connectivity/GeneralTest.java +++ b/connectivity/qa/connectivity/GeneralTest.java @@ -1,7 +1,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 @@ -33,7 +33,7 @@ import com.sun.star.lang.XMultiServiceFactory; import complexlib.ComplexTestCase; - + //import complex.connectivity.DBaseStringFunctions; public class GeneralTest extends ComplexTestCase { @@ -48,7 +48,7 @@ public class GeneralTest extends ComplexTestCase { public void assure2(String s,boolean b){ assure(s,b); } - + public void test() throws com.sun.star.uno.Exception,com.sun.star.beans.UnknownPropertyException { try { diff --git a/connectivity/qa/connectivity/tools/AbstractDatabase.java b/connectivity/qa/connectivity/tools/AbstractDatabase.java index b47c7c7961da..0137dbc9ab5e 100755 --- a/connectivity/qa/connectivity/tools/AbstractDatabase.java +++ b/connectivity/qa/connectivity/tools/AbstractDatabase.java @@ -1,7 +1,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 @@ -81,7 +81,7 @@ public abstract class AbstractDatabase implements DatabaseAccess { if ( m_connection == null ) m_connection = new Connection( m_databaseDocument.getDataSource().getConnection("", "") ); - + return m_connection; } diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java index a1b457884948..aa5811e74605 100644 --- a/connectivity/qa/connectivity/tools/CRMDatabase.java +++ b/connectivity/qa/connectivity/tools/CRMDatabase.java @@ -1,7 +1,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/qa/connectivity/tools/DataSource.java b/connectivity/qa/connectivity/tools/DataSource.java index 221ada3cb487..3c2d2ff5c29c 100644 --- a/connectivity/qa/connectivity/tools/DataSource.java +++ b/connectivity/qa/connectivity/tools/DataSource.java @@ -1,7 +1,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 @@ -122,10 +122,10 @@ public class DataSource } /** returns the name of the data source - * + * * If a data source is registered at the database context, the name is the registration * name. Otherwise, its the URL which the respective database document is based on. - * + * * Note that the above definition is from the UNO API, not from this wrapper here. */ public String getName() diff --git a/connectivity/qa/connectivity/tools/DatabaseAccess.java b/connectivity/qa/connectivity/tools/DatabaseAccess.java index c099a44d1fb9..b86866202bcf 100755 --- a/connectivity/qa/connectivity/tools/DatabaseAccess.java +++ b/connectivity/qa/connectivity/tools/DatabaseAccess.java @@ -1,7 +1,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/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java index ae40be4222aa..63c8acb118f0 100755 --- a/connectivity/qa/connectivity/tools/DbaseDatabase.java +++ b/connectivity/qa/connectivity/tools/DbaseDatabase.java @@ -1,7 +1,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/qa/connectivity/tools/HsqlColumnDescriptor.java b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java index c0c46d07149f..824f7ebd2fdb 100644 --- a/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java +++ b/connectivity/qa/connectivity/tools/HsqlColumnDescriptor.java @@ -1,7 +1,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/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java index 058c61e1afaa..d39a322f2f21 100644 --- a/connectivity/qa/connectivity/tools/HsqlDatabase.java +++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java @@ -1,7 +1,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 @@ -82,7 +82,7 @@ public class HsqlDatabase extends AbstractDatabase final XStorable storable = (XStorable) UnoRuntime.queryInterface(XStorable.class, m_databaseDocument); storable.storeAsURL( m_databaseDocumentFile, new PropertyValue[] - { new PropertyValue( "PickListEntry", 0, false, PropertyState.DIRECT_VALUE ) + { new PropertyValue( "PickListEntry", 0, false, PropertyState.DIRECT_VALUE ) } ); } diff --git a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java index dcda754f8b8c..b4d1f656dc4a 100644 --- a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java +++ b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java @@ -1,7 +1,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 @@ -75,7 +75,7 @@ public class HsqlTableDescriptor tableDesc.setPropertyValue( "Name", getName() ); } catch ( Exception e ) { e.printStackTrace( System.err ); } - + XColumnsSupplier suppDescCols = UnoRuntime.queryInterface( XColumnsSupplier.class, tableDesc ); XNameAccess descColumns = suppDescCols.getColumns(); diff --git a/connectivity/qa/connectivity/tools/QueryDefinition.java b/connectivity/qa/connectivity/tools/QueryDefinition.java index ebc9d1a25cfe..4ca3ca0ef21d 100644 --- a/connectivity/qa/connectivity/tools/QueryDefinition.java +++ b/connectivity/qa/connectivity/tools/QueryDefinition.java @@ -1,7 +1,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/qa/connectivity/tools/RowSet.java b/connectivity/qa/connectivity/tools/RowSet.java index a26456dcc746..7581804e3330 100644 --- a/connectivity/qa/connectivity/tools/RowSet.java +++ b/connectivity/qa/connectivity/tools/RowSet.java @@ -1,7 +1,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/qa/drivers/dbase/DBaseDateFunctions.java b/connectivity/qa/drivers/dbase/DBaseDateFunctions.java index b48ae2158359..52605d324f42 100644 --- a/connectivity/qa/drivers/dbase/DBaseDateFunctions.java +++ b/connectivity/qa/drivers/dbase/DBaseDateFunctions.java @@ -1,7 +1,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/qa/drivers/dbase/DBaseDriverTest.java b/connectivity/qa/drivers/dbase/DBaseDriverTest.java index 2e2920b4145b..a12a6a4cdd28 100644 --- a/connectivity/qa/drivers/dbase/DBaseDriverTest.java +++ b/connectivity/qa/drivers/dbase/DBaseDriverTest.java @@ -1,7 +1,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/qa/drivers/dbase/DBaseNumericFunctions.java b/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java index b3c8ff014a2f..2a32179da0bc 100644 --- a/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java +++ b/connectivity/qa/drivers/dbase/DBaseNumericFunctions.java @@ -1,7 +1,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/qa/drivers/dbase/DBaseSqlTests.java b/connectivity/qa/drivers/dbase/DBaseSqlTests.java index c393c5a48356..37fca35439ea 100755 --- a/connectivity/qa/drivers/dbase/DBaseSqlTests.java +++ b/connectivity/qa/drivers/dbase/DBaseSqlTests.java @@ -1,7 +1,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 @@ -92,5 +92,5 @@ public class DBaseSqlTests } } - + } diff --git a/connectivity/qa/drivers/dbase/DBaseStringFunctions.java b/connectivity/qa/drivers/dbase/DBaseStringFunctions.java index 1d4ccf0a9b26..1cc576b1e7ad 100644 --- a/connectivity/qa/drivers/dbase/DBaseStringFunctions.java +++ b/connectivity/qa/drivers/dbase/DBaseStringFunctions.java @@ -1,7 +1,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/qa/drivers/hsqldb/DatabaseMetaData.java b/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java index ddc45a4e0ca1..e18e966fbdee 100644 --- a/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java +++ b/connectivity/qa/drivers/hsqldb/DatabaseMetaData.java @@ -17,28 +17,28 @@ import qa.drivers.hsqldb.DriverTest; public class DatabaseMetaData { - + private java.sql.DatabaseMetaData m_xMD; private DriverTest m_TestCase; - + /** Creates a new instance of DatabaseMetaData */ public DatabaseMetaData(DriverTest _testCase,java.sql.DatabaseMetaData _xmd) { m_TestCase = _testCase; m_xMD = _xmd; } - + protected void assure(String _sText,boolean btest){ m_TestCase.assurePublic(_sText,btest); } - + protected void testMethod(String sName,Class[] params,Object[] objParams,int nCount){ try { System.out.println("test method " + sName); - + Method aGet = ((Object)m_xMD).getClass().getDeclaredMethod(sName, params); if ( aGet != null ){ ResultSet rs = (ResultSet)aGet.invoke(m_xMD, objParams); - ResultSetMetaData rsMD = rs.getMetaData(); + ResultSetMetaData rsMD = rs.getMetaData(); assure( sName + " returns wrong column count" , rsMD.getColumnCount() == nCount); } @@ -53,14 +53,14 @@ public class DatabaseMetaData { } catch( java.lang.reflect.InvocationTargetException ex ) { assure("IllegalAccessException!",false); } finally { - + } } - + public void test(){ - + // try { - + try{ ResultSet rs = m_xMD.getTables(null,null,"TESTCASE",null); while ( rs.next() ) @@ -85,14 +85,14 @@ public class DatabaseMetaData { } } catch(Exception e){ - + } //testMethod("getTypeInfo", zclass,empty,17); /* Class[] zclass = new Class[]{}; Object[] empty = new Object[]{}; testMethod("getCatalogs", zclass,empty,1); - + testMethod("getSchemas", zclass,empty,2); testMethod("getTableTypes", zclass,empty,1); Class[] a4 = new Class[4]; @@ -110,7 +110,7 @@ public class DatabaseMetaData { testMethod("getColumns", a4,o4,18); testMethod("getProcedureColumns", a4,o4,13); testMethod("getColumns", a4,o4,18); - + Class[] a3 = new Class[3]; Object[] o3 = new Object[3]; a3[0] = Class.forName("java.lang.Object"); @@ -120,7 +120,7 @@ public class DatabaseMetaData { o3[0] = null; o3[1] = null; o3[2] = "%"; - + testMethod("getExportedKeys", a3,o3,14); testMethod("getImportedKeys", a3,o3,14); testMethod("getPrimaryKeys", a3,o3,14); @@ -128,24 +128,24 @@ public class DatabaseMetaData { testMethod("getTablePrivileges", a3,o3,6); testMethod("getVersionColumns", a3,o3,7); // testMethod("getCrossReference", a3,o3,14); - + } catch( java.lang.ClassNotFoundException ex) { assure("ClassNotFoundException: " + ex.getMessage() ,false); } */ } -/* +/* public com.sun.star.sdbc.XResultSet getCrossReference(Object obj, String str, String str2, Object obj3, String str4, String str5) { } public com.sun.star.sdbc.XResultSet getIndexInfo(Object obj, String str, String str2, boolean param, boolean param4) { } - + public com.sun.star.sdbc.XResultSet getTables(Object obj, String str, String str2, String[] str3) { } - + public com.sun.star.sdbc.XResultSet getUDTs(Object obj, String str, String str2, int[] values) { } - + public com.sun.star.sdbc.XResultSet getBestRowIdentifier(Object obj, String str, String str2, int param, boolean param4) throws com.sun.star.sdbc.SQLException { } */ diff --git a/connectivity/qa/drivers/hsqldb/DriverTest.java b/connectivity/qa/drivers/hsqldb/DriverTest.java index d343a1309a05..be9fa42e0915 100644 --- a/connectivity/qa/drivers/hsqldb/DriverTest.java +++ b/connectivity/qa/drivers/hsqldb/DriverTest.java @@ -1,7 +1,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,7 +42,7 @@ import com.sun.star.document.XDocumentSubStorageSupplier; import complexlib.ComplexTestCase; import java.io.PrintWriter; - + import util.utils; import java.util.*; import java.io.*; @@ -59,7 +59,7 @@ import com.sun.star.embed.XStorage; public class DriverTest extends ComplexTestCase { - + public String[] getTestMethodNames() { return new String[] { "test" }; } @@ -67,7 +67,7 @@ public class DriverTest extends ComplexTestCase { public String getTestObjectName() { return "DriverTest"; } - + public void assurePublic(String sMessage,boolean check){ addResult(sMessage,check); } @@ -82,7 +82,7 @@ public class DriverTest extends ComplexTestCase { } catch(Exception ex) { throw new RuntimeException("factory: unable to construct data source" ); } - + try{ XDocumentSubStorageSupplier doc = (XDocumentSubStorageSupplier)UnoRuntime.queryInterface(XDocumentSubStorageSupplier.class,ds); XStorage stor = doc.getDocumentSubStorage("database",4); @@ -118,13 +118,13 @@ public class DriverTest extends ComplexTestCase { info = new com.sun.star.beans.PropertyValue[]{ new com.sun.star.beans.PropertyValue("Storage",0,stor,PropertyState.DIRECT_VALUE) ,new com.sun.star.beans.PropertyValue("URL",0,mod.getURL(),PropertyState.DIRECT_VALUE) - }; + }; drv = (XDriver)UnoRuntime.queryInterface(XDriver.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.sdbcx.comp.hsqldb.Driver")); - + TestCacheSize test = new TestCacheSize(((XMultiServiceFactory)param.getMSF()),info,drv); - StopWatch sw = new StopWatch(); + StopWatch sw = new StopWatch(); try{ test.setUp(); @@ -143,20 +143,20 @@ public class DriverTest extends ComplexTestCase { public void test2(){ mThreadTimeOut = 10000000; System.gc(); - + com.sun.star.beans.PropertyValue[] info = null; XDriver drv = null; try{ info = new com.sun.star.beans.PropertyValue[]{ new com.sun.star.beans.PropertyValue("JavaDriverClass",0,"org.hsqldb.jdbcDriver",PropertyState.DIRECT_VALUE) ,new com.sun.star.beans.PropertyValue("ParameterNameSubstitution",0,new Boolean(false),PropertyState.DIRECT_VALUE) - }; + }; drv = (XDriver)UnoRuntime.queryInterface(XDriver.class,((XMultiServiceFactory)param.getMSF()).createInstance("com.sun.star.comp.sdbc.JDBCDriver")); TestCacheSize test = new TestCacheSize(((XMultiServiceFactory)param.getMSF()),info,drv); test.setURL("jdbc:hsqldb:g:\\hsql\\db"); - StopWatch sw = new StopWatch(); + StopWatch sw = new StopWatch(); try{ test.setUp(); diff --git a/connectivity/qa/drivers/hsqldb/TestCacheSize.java b/connectivity/qa/drivers/hsqldb/TestCacheSize.java index 4701905772b8..f557d470c841 100644 --- a/connectivity/qa/drivers/hsqldb/TestCacheSize.java +++ b/connectivity/qa/drivers/hsqldb/TestCacheSize.java @@ -18,9 +18,9 @@ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT @@ -84,7 +84,7 @@ public class TestCacheSize { // frequent reporting of progress boolean reportProgress = false; - + XMultiServiceFactory servicefactory = null; // type of the big table {MEMORY | CACHED | TEXT} @@ -122,7 +122,7 @@ public class TestCacheSize { XDataSource ds; XDriver drv; com.sun.star.beans.PropertyValue[] info; - + TestCacheSize(XMultiServiceFactory _xmulti,com.sun.star.beans.PropertyValue[] _info,XDriver _drv){ servicefactory = _xmulti; drv = _drv; @@ -132,9 +132,9 @@ public class TestCacheSize { void setURL(String _url){ url = _url; } - + protected void setUp() { - + user = "sa"; password = ""; @@ -145,7 +145,7 @@ public class TestCacheSize { //Class.forName("org.hsqldb.jdbcDriver"); if (filedb) { - + cConnection = drv.connect(url,info); sStatement = cConnection.createStatement(); diff --git a/connectivity/qa/drivers/jdbc/LongVarCharTest.java b/connectivity/qa/drivers/jdbc/LongVarCharTest.java index a5797b223b61..86de0b340992 100644 --- a/connectivity/qa/drivers/jdbc/LongVarCharTest.java +++ b/connectivity/qa/drivers/jdbc/LongVarCharTest.java @@ -1,7 +1,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/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx index 99bdeee12131..047a30b39d33 100644 --- a/connectivity/source/commontools/AutoRetrievingBase.cxx +++ b/connectivity/source/commontools/AutoRetrievingBase.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 @@ -35,7 +35,7 @@ namespace connectivity ::rtl::OUString OAutoRetrievingBase::getTransformedGeneratedStatement(const ::rtl::OUString& _sInsertStatement) const { ::rtl::OUString sStmt = _sInsertStatement; - OSL_ENSURE( m_bAutoRetrievingEnabled,"Illegal call here. isAutoRetrievingEnabled is false!"); + OSL_ENSURE( m_bAutoRetrievingEnabled,"Illegal call here. isAutoRetrievingEnabled is false!"); sStmt = sStmt.toAsciiUpperCase(); ::rtl::OUString sStatement; if ( sStmt.compareToAscii("INSERT",6) == 0 ) @@ -60,7 +60,7 @@ namespace connectivity sStmt = sStmt.copy(1); } while (sStmt.indexOf(' ') == 0 ); - + nIntoIndex = 0; ::rtl::OUString sTableName = sStmt.getToken(0,' ',nIntoIndex); sStatement = sStatement.replaceAt(nIndex,sTable.getLength(),sTableName); diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx index 48681b61e1f9..7de16e76d2f9 100644 --- a/connectivity/source/commontools/BlobHelper.cxx +++ b/connectivity/source/commontools/BlobHelper.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 @@ -59,13 +59,13 @@ BlobHelper::BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val) // ----------------------------------------------------------------------------- ::sal_Int64 SAL_CALL BlobHelper::position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - ::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this ); + ::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this ); return 0; } // ----------------------------------------------------------------------------- ::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - ::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", *this ); + ::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", *this ); return 0; } diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index fd0da2f093e5..2d3368fec703 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.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 @@ -56,7 +56,7 @@ namespace connectivity using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace dbtools; - namespace starjava = com::sun::star::java; + namespace starjava = com::sun::star::java; //------------------------------------------------------------------------------ const sal_Unicode CHAR_PLACE = '_'; const sal_Unicode CHAR_WILD = '%'; @@ -280,7 +280,7 @@ namespace connectivity if ( _pJVM.is() ) { jvmaccess::VirtualMachine::AttachGuard aGuard(_pJVM); - JNIEnv* pEnv = aGuard.getEnvironment(); + JNIEnv* pEnv = aGuard.getEnvironment(); if( pEnv ) { ::rtl::OString sClassName = ::rtl::OUStringToOString(_sClassName, RTL_TEXTENCODING_ASCII_US); @@ -296,7 +296,7 @@ namespace connectivity } -#include <ctype.h> //isdigit +#include <ctype.h> //isdigit namespace dbtools { //------------------------------------------------------------------ @@ -320,10 +320,10 @@ sal_Bool isValidSQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSp if(!isCharOk(*pStr,_rSpecials)) return sal_False; - if ( rName.getLength() - && ( (rName.toChar() == '_') - || ( (rName.toChar() >= '0') - && (rName.toChar() <= '9') + if ( rName.getLength() + && ( (rName.toChar() == '_') + || ( (rName.toChar() >= '0') + && (rName.toChar() <= '9') ) ) ) diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index 18252103945b..74ca78a4e48f 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.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 @@ -88,7 +88,7 @@ void OConnectionWrapper::setDelegation(const Reference< XConnection >& _xConnect m_xUnoTunnel.set(m_xConnection,UNO_QUERY); m_xServiceInfo.set(m_xConnection,UNO_QUERY); - Reference< XProxyFactory > xProxyFactory(_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory"))),UNO_QUERY); + Reference< XProxyFactory > xProxyFactory(_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory"))),UNO_QUERY); Reference< XAggregation > xConProxy = xProxyFactory->createProxy(_xConnection); if (xConProxy.is()) { diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 3f5093c3a225..0726db320ca0 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.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 @@ -149,10 +149,10 @@ using namespace ::com::sun::star::beans; // check if this is really a timestamp or only a date if ( bOk ) { - if (bQuote) + if (bQuote) aRet.appendAscii("{TS '"); aRet.append(DBTypeConversion::toDateTimeString(aDateTime)); - if (bQuote) + if (bQuote) aRet.appendAscii("'}"); break; } @@ -179,12 +179,12 @@ using namespace ::com::sun::star::beans; else bOk = _rVal >>= aDate; OSL_VERIFY_RES( bOk, "DBTypeConversion::toSQLString: _rVal is not date!"); - if (bQuote) + if (bQuote) aRet.appendAscii("{D '"); aRet.append(DBTypeConversion::toDateString(aDate)); - if (bQuote) + if (bQuote) aRet.appendAscii("'}"); - } break; + } break; case DataType::TIME: { Time aTime; @@ -206,10 +206,10 @@ using namespace ::com::sun::star::beans; else bOk = _rVal >>= aTime; OSL_VERIFY_RES( bOk,"DBTypeConversion::toSQLString: _rVal is not time!"); - if (bQuote) + if (bQuote) aRet.appendAscii("{T '"); aRet.append(DBTypeConversion::toTimeString(aTime)); - if (bQuote) + if (bQuote) aRet.appendAscii("'}"); } break; } @@ -271,7 +271,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant, // und noch eine Sonderbehandlung, diesmal fuer Prozent-Formate if ((NumberFormat::NUMBER == nRealUsedTypeClass) && (NumberFormat::PERCENT == nTypeClass)) - { // die Formatierung soll eigentlich als Prozent erfolgen, aber der String stellt nur eine + { // die Formatierung soll eigentlich als Prozent erfolgen, aber der String stellt nur eine // einfache Nummer dar -> anpassen ::rtl::OUString sExpanded(rString); static ::rtl::OUString s_sPercentSymbol = ::rtl::OUString::createFromAscii("%"); @@ -286,7 +286,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant, case NumberFormat::DATETIME: case NumberFormat::TIME: DBTypeConversion::setValue(xVariant,rNullDate,fValue,nRealUsedTypeClass); - // xVariant->updateDouble(toStandardDbDate(rNullDate, fValue)); + // xVariant->updateDouble(toStandardDbDate(rNullDate, fValue)); break; case NumberFormat::CURRENCY: case NumberFormat::NUMBER: @@ -339,27 +339,27 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant, default: { double nValue = rValue; -// Reference<XPropertySet> xProp(xVariant,UNO_QUERY); -// if ( xProp.is() -// && xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED)) -// && !::comphelper::getBOOL(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))) ) -// { -// switch (::comphelper::getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) -// { -// case DataType::TINYINT: -// nValue = static_cast<sal_uInt8>(rValue); -// break; -// case DataType::SMALLINT: -// nValue = static_cast<sal_uInt16>(rValue); -// break; -// case DataType::INTEGER: -// nValue = static_cast<sal_uInt32>(rValue); -// break; -// case DataType::BIGINT: -// nValue = static_cast<sal_uInt64>(rValue); -// break; -// } -// } +// Reference<XPropertySet> xProp(xVariant,UNO_QUERY); +// if ( xProp.is() +// && xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED)) +// && !::comphelper::getBOOL(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))) ) +// { +// switch (::comphelper::getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) +// { +// case DataType::TINYINT: +// nValue = static_cast<sal_uInt8>(rValue); +// break; +// case DataType::SMALLINT: +// nValue = static_cast<sal_uInt16>(rValue); +// break; +// case DataType::INTEGER: +// nValue = static_cast<sal_uInt32>(rValue); +// break; +// case DataType::BIGINT: +// nValue = static_cast<sal_uInt64>(rValue); +// break; +// } +// } xVariant->updateDouble(nValue); } } @@ -383,8 +383,8 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant, default: { Reference<XPropertySet> xProp(xVariant,UNO_QUERY); - if ( xProp.is() - && xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED)) + if ( xProp.is() + && xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED)) && !::comphelper::getBOOL(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))) ) { switch (::comphelper::getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) @@ -497,13 +497,13 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant, double fValue = xVariant->getDouble(); if (!xVariant->wasNull()) aString = xFormatter->convertNumberToString(nKey, fValue); - } break; + } break; case NumberFormat::CURRENCY: { double fValue = xVariant->getDouble(); if (!xVariant->wasNull()) aString = xFormatter->getInputString(nKey, fValue); - } break; + } break; case NumberFormat::TEXT: aString = xFormatter->formatString(nKey, xVariant->getString()); break; diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx index cc19bce60abb..12564203dd36 100644 --- a/connectivity/source/commontools/DriversConfig.cxx +++ b/connectivity/source/commontools/DriversConfig.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 @@ -32,7 +32,7 @@ using namespace connectivity; using namespace utl; using namespace ::com::sun::star; -namespace +namespace { void lcl_convert(const uno::Sequence< ::rtl::OUString >& _aSource,uno::Any& _rDest) { @@ -101,7 +101,7 @@ namespace } } // ----------------------------------------------------------------------------- -DriversConfigImpl::DriversConfigImpl() +DriversConfigImpl::DriversConfigImpl() { } // ----------------------------------------------------------------------------- @@ -174,7 +174,7 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs ) sOldPattern = aIter->first; } } - + return sRet; } // ----------------------------------------------------------------------------- @@ -194,7 +194,7 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs ) sOldPattern = aIter->first; } } - + return sRet; } // ----------------------------------------------------------------------------- @@ -215,7 +215,7 @@ const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const ::rtl // ----------------------------------------------------------------------------- const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const { - const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB); + const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB); const ::comphelper::NamedValueCollection* pRet = NULL; ::rtl::OUString sOldPattern; TInstalledDrivers::const_iterator aIter = rDrivers.begin(); diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 9afa80803867..cc57466d7cc0 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.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 @@ -93,9 +93,9 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet() // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSet::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); } // ----------------------------------------------------------------------------- @@ -130,7 +130,7 @@ void ODatabaseMetaDataResultSet::disposing(void) OPropertySetHelper::disposing(); ::osl::MutexGuard aGuard(m_aMutex); - m_aStatement = NULL; + m_aStatement = NULL; m_xMetaData.clear(); m_aRowsIter = m_aRows.end(); m_aRows.clear(); @@ -155,7 +155,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -877,7 +877,7 @@ namespace &cppu::createSingleComponentFactory, 0, 0 }, { &ParameterSubstitution::create, &ParameterSubstitution::getImplementationName_Static, &ParameterSubstitution::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } using ::rtl::OUString; @@ -911,6 +911,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implNam return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries); } -} // extern "C" +} // extern "C" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx index 7113ed87c573..baa6dd20390b 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.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 @@ -183,8 +183,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 co sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { -// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) -// return (*m_mColumnsIter).second.isReadOnly(); +// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) +// return (*m_mColumnsIter).second.isReadOnly(); return sal_True; } @@ -192,8 +192,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*co sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { -// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) -// return (*m_mColumnsIter).second.isDefinitelyWritable(); +// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) +// return (*m_mColumnsIter).second.isDefinitelyWritable(); return sal_False; ; @@ -201,8 +201,8 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_ // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { -// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) -// return (*m_mColumnsIter).second.isWritable(); +// if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) +// return (*m_mColumnsIter).second.isWritable(); return isDefinitelyWritable(column); } // ------------------------------------------------------------------------- @@ -255,7 +255,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnMap() void ODatabaseMetaDataResultSetMetaData::setColumnsMap() { setColumnMap(); - + m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString::createFromAscii("DATA_TYPE"), ColumnValue::NO_NULLS, 0,0,0, diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index ae67f54233ae..5e020b71c931 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.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 @@ -64,49 +64,49 @@ namespace { case DataType::DECIMAL: case DataType::NUMERIC: case DataType::LONGVARCHAR: - bIsCompatible = (DataType::CHAR == _eType2) - || (DataType::VARCHAR == _eType2) - || (DataType::DECIMAL == _eType2) - || (DataType::NUMERIC == _eType2) - || (DataType::LONGVARCHAR == _eType2); + bIsCompatible = (DataType::CHAR == _eType2) + || (DataType::VARCHAR == _eType2) + || (DataType::DECIMAL == _eType2) + || (DataType::NUMERIC == _eType2) + || (DataType::LONGVARCHAR == _eType2); break; case DataType::DOUBLE: case DataType::REAL: - bIsCompatible = (DataType::DOUBLE == _eType2) - || (DataType::REAL == _eType2); + bIsCompatible = (DataType::DOUBLE == _eType2) + || (DataType::REAL == _eType2); break; case DataType::BINARY: case DataType::VARBINARY: case DataType::LONGVARBINARY: - bIsCompatible = (DataType::BINARY == _eType2) - || (DataType::VARBINARY == _eType2) - || (DataType::LONGVARBINARY == _eType2); + bIsCompatible = (DataType::BINARY == _eType2) + || (DataType::VARBINARY == _eType2) + || (DataType::LONGVARBINARY == _eType2); break; case DataType::INTEGER: - bIsCompatible = (DataType::SMALLINT == _eType2) - || (DataType::TINYINT == _eType2) - || (DataType::BIT == _eType2) - || (DataType::BOOLEAN == _eType2); + bIsCompatible = (DataType::SMALLINT == _eType2) + || (DataType::TINYINT == _eType2) + || (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); break; case DataType::SMALLINT: - bIsCompatible = (DataType::TINYINT == _eType2) - || (DataType::BIT == _eType2) - || (DataType::BOOLEAN == _eType2); + bIsCompatible = (DataType::TINYINT == _eType2) + || (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); break; case DataType::TINYINT: - bIsCompatible = (DataType::BIT == _eType2) - || (DataType::BOOLEAN == _eType2); + bIsCompatible = (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); break; case DataType::BLOB: case DataType::CLOB: case DataType::OBJECT: - bIsCompatible = (DataType::BLOB == _eType2) - || (DataType::CLOB == _eType2) - || (DataType::OBJECT == _eType2); + bIsCompatible = (DataType::BLOB == _eType2) + || (DataType::CLOB == _eType2) + || (DataType::OBJECT == _eType2); break; default: @@ -127,8 +127,8 @@ namespace tracing { struct AllocationType { - const sal_Char* pName; - sal_Int32 nAllocatedUnits; + const sal_Char* pName; + sal_Int32 nAllocatedUnits; AllocationType( ) : pName( NULL ), nAllocatedUnits( 0 ) { } }; @@ -137,23 +137,23 @@ namespace tracing class AllocationTracer { public: - typedef ::std::vector< AllocationType > AllocationState; - static AllocationState s_aAllocated; - static ::osl::Mutex s_aMutex; + typedef ::std::vector< AllocationType > AllocationState; + static AllocationState s_aAllocated; + static ::osl::Mutex s_aMutex; public: static void registerUnit( const sal_Char* _pName ); static void revokeUnit( const sal_Char* _pName ); private: - static AllocationState::iterator getLocation( const sal_Char* _pName ); + static AllocationState::iterator getLocation( const sal_Char* _pName ); }; // ============================================================================= - AllocationTracer::AllocationState::iterator AllocationTracer::getLocation( const sal_Char* _pName ) + AllocationTracer::AllocationState::iterator AllocationTracer::getLocation( const sal_Char* _pName ) { AllocationState::iterator aLookFor = s_aAllocated.begin(); - for ( ; + for ( ; aLookFor != s_aAllocated.end(); ++aLookFor ) @@ -165,13 +165,13 @@ namespace tracing // not found s_aAllocated.push_back( AllocationType() ); aLookFor = s_aAllocated.end(); --aLookFor; - aLookFor->pName = _pName; // note that this assumes that _pName is a constant string .... + aLookFor->pName = _pName; // note that this assumes that _pName is a constant string .... return aLookFor; } // ============================================================================= - AllocationTracer::AllocationState AllocationTracer::s_aAllocated; - ::osl::Mutex AllocationTracer::s_aMutex; + AllocationTracer::AllocationState AllocationTracer::s_aAllocated; + ::osl::Mutex AllocationTracer::s_aMutex; // ============================================================================= void AllocationTracer::registerUnit( const sal_Char* _pName ) @@ -191,8 +191,8 @@ namespace tracing --aPos->nAllocatedUnits; } -#define TRACE_ALLOC( type ) tracing::AllocationTracer::registerUnit( #type ); -#define TRACE_FREE( type ) tracing::AllocationTracer::revokeUnit( #type ); +#define TRACE_ALLOC( type ) tracing::AllocationTracer::registerUnit( #type ); +#define TRACE_FREE( type ) tracing::AllocationTracer::revokeUnit( #type ); } #else #define TRACE_ALLOC( type ) @@ -373,9 +373,9 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) if ( m_eTypeKind != _rRH.m_eTypeKind || (_rRH.m_bNull && !m_bNull) || m_bSigned != _rRH.m_bSigned) free(); - m_bBound = _rRH.m_bBound; - m_eTypeKind = _rRH.m_eTypeKind; - m_bSigned = _rRH.m_bSigned; + m_bBound = _rRH.m_bBound; + m_eTypeKind = _rRH.m_eTypeKind; + m_bSigned = _rRH.m_bSigned; if(m_bNull && !_rRH.m_bNull) { @@ -392,7 +392,7 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) case DataType::BIGINT: if ( _rRH.m_bSigned ) { - m_aValue.m_pValue = new sal_Int64(*(sal_Int64*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new sal_Int64(*(sal_Int64*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( sal_Int64 ) } else @@ -402,59 +402,59 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) } break; case DataType::FLOAT: - m_aValue.m_pValue = new float(*(float*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new float(*(float*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( float ) break; case DataType::DOUBLE: case DataType::REAL: - m_aValue.m_pValue = new double(*(double*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new double(*(double*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( double ) break; case DataType::DATE: - m_aValue.m_pValue = new Date(*(Date*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new Date(*(Date*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( Date ) break; case DataType::TIME: - m_aValue.m_pValue = new Time(*(Time*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new Time(*(Time*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( Time ) break; case DataType::TIMESTAMP: - m_aValue.m_pValue = new DateTime(*(DateTime*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new DateTime(*(DateTime*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( DateTime ) break; case DataType::BINARY: case DataType::VARBINARY: case DataType::LONGVARBINARY: - m_aValue.m_pValue = new Sequence<sal_Int8>(*(Sequence<sal_Int8>*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new Sequence<sal_Int8>(*(Sequence<sal_Int8>*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( Sequence_sal_Int8 ) break; case DataType::BIT: case DataType::BOOLEAN: - m_aValue.m_bBool = _rRH.m_aValue.m_bBool; + m_aValue.m_bBool = _rRH.m_aValue.m_bBool; break; case DataType::TINYINT: if ( _rRH.m_bSigned ) - m_aValue.m_nInt8 = _rRH.m_aValue.m_nInt8; + m_aValue.m_nInt8 = _rRH.m_aValue.m_nInt8; else - m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; + m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; break; case DataType::SMALLINT: if ( _rRH.m_bSigned ) - m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; + m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; else - m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; + m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; break; case DataType::INTEGER: if ( _rRH.m_bSigned ) - m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; + m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; else { - m_aValue.m_pValue = new sal_Int64(*(sal_Int64*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new sal_Int64(*(sal_Int64*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( sal_Int64 ) } break; default: - m_aValue.m_pValue = new Any(*(Any*)_rRH.m_aValue.m_pValue); + m_aValue.m_pValue = new Any(*(Any*)_rRH.m_aValue.m_pValue); TRACE_ALLOC( Any ) } } @@ -498,34 +498,34 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH) break; case DataType::BIT: case DataType::BOOLEAN: - m_aValue.m_bBool = _rRH.m_aValue.m_bBool; + m_aValue.m_bBool = _rRH.m_aValue.m_bBool; break; case DataType::TINYINT: if ( _rRH.m_bSigned ) - m_aValue.m_nInt8 = _rRH.m_aValue.m_nInt8; + m_aValue.m_nInt8 = _rRH.m_aValue.m_nInt8; else - m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; + m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; break; case DataType::SMALLINT: if ( _rRH.m_bSigned ) - m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; + m_aValue.m_nInt16 = _rRH.m_aValue.m_nInt16; else - m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; + m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; break; case DataType::INTEGER: if ( _rRH.m_bSigned ) - m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; + m_aValue.m_nInt32 = _rRH.m_aValue.m_nInt32; else *static_cast<sal_Int64*>(m_aValue.m_pValue) = *(sal_Int64*)_rRH.m_aValue.m_pValue; break; default: - (*(Any*)m_aValue.m_pValue) = (*(Any*)_rRH.m_aValue.m_pValue); + (*(Any*)m_aValue.m_pValue) = (*(Any*)_rRH.m_aValue.m_pValue); } } - m_bNull = _rRH.m_bNull; + m_bNull = _rRH.m_bNull; // OJ: BUGID: 96277 - m_eTypeKind = _rRH.m_eTypeKind; + m_eTypeKind = _rRH.m_eTypeKind; return *this; } @@ -1009,8 +1009,8 @@ Any ORowSetValue::makeAny() const { ::rtl::OUStringBuffer sVal = ::rtl::OUString::createFromAscii("0x"); Sequence<sal_Int8> aSeq(getSequence()); - const sal_Int8* pBegin = aSeq.getConstArray(); - const sal_Int8* pEnd = pBegin + aSeq.getLength(); + const sal_Int8* pBegin = aSeq.getConstArray(); + const sal_Int8* pEnd = pBegin + aSeq.getLength(); for(;pBegin != pEnd;++pBegin) sVal.append((sal_Int32)*pBegin,16); aRet = sVal.makeStringAndClear(); @@ -1062,7 +1062,7 @@ Any ORowSetValue::makeAny() const return aRet; } // ------------------------------------------------------------------------- -sal_Bool ORowSetValue::getBool() const +sal_Bool ORowSetValue::getBool() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getBool" ); sal_Bool bRet = sal_False; @@ -1091,7 +1091,7 @@ sal_Bool ORowSetValue::getBool() const // run through case DataType::DECIMAL: case DataType::NUMERIC: - + bRet = ::rtl::OUString(m_aValue.m_pString).toInt32() != 0; break; case DataType::BIGINT: @@ -1139,7 +1139,7 @@ sal_Bool ORowSetValue::getBool() const return bRet; } // ------------------------------------------------------------------------- -sal_Int8 ORowSetValue::getInt8() const +sal_Int8 ORowSetValue::getInt8() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getInt8" ); @@ -1212,7 +1212,7 @@ sal_Int8 ORowSetValue::getInt8() const return nRet; } // ------------------------------------------------------------------------- -sal_Int16 ORowSetValue::getInt16() const +sal_Int16 ORowSetValue::getInt16() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getInt16" ); @@ -1285,7 +1285,7 @@ sal_Int16 ORowSetValue::getInt16() const return nRet; } // ------------------------------------------------------------------------- -sal_Int32 ORowSetValue::getInt32() const +sal_Int32 ORowSetValue::getInt32() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getInt32" ); sal_Int32 nRet = 0; @@ -1358,7 +1358,7 @@ sal_Int32 ORowSetValue::getInt32() const return nRet; } // ------------------------------------------------------------------------- -sal_Int64 ORowSetValue::getLong() const +sal_Int64 ORowSetValue::getLong() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getLong" ); sal_Int64 nRet = 0; @@ -1431,7 +1431,7 @@ sal_Int64 ORowSetValue::getLong() const return nRet; } // ------------------------------------------------------------------------- -float ORowSetValue::getFloat() const +float ORowSetValue::getFloat() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getFloat" ); float nRet = 0; @@ -1508,7 +1508,7 @@ float ORowSetValue::getFloat() const return nRet; } // ------------------------------------------------------------------------- -double ORowSetValue::getDouble() const +double ORowSetValue::getDouble() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getDouble" ); @@ -1681,7 +1681,7 @@ void ORowSetValue::setFromDouble(const double& _rVal,sal_Int32 _nDatatype) m_eTypeKind = _nDatatype; } // ----------------------------------------------------------------------------- -Sequence<sal_Int8> ORowSetValue::getSequence() const +Sequence<sal_Int8> ORowSetValue::getSequence() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getSequence" ); Sequence<sal_Int8> aSeq; @@ -1708,13 +1708,13 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const } if(xStream.is()) { - const sal_uInt32 nBytesToRead = 65535; - sal_uInt32 nRead; + const sal_uInt32 nBytesToRead = 65535; + sal_uInt32 nRead; do { ::com::sun::star::uno::Sequence< sal_Int8 > aReadSeq; - + nRead = xStream->readSomeBytes( aReadSeq, nBytesToRead ); if( nRead ) @@ -1754,7 +1754,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const } // ----------------------------------------------------------------------------- -::com::sun::star::util::Date ORowSetValue::getDate() const +::com::sun::star::util::Date ORowSetValue::getDate() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getDate" ); ::com::sun::star::util::Date aValue; @@ -1783,9 +1783,9 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const case DataType::TIMESTAMP: { ::com::sun::star::util::DateTime* pDateTime = static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue); - aValue.Day = pDateTime->Day; - aValue.Month = pDateTime->Month; - aValue.Year = pDateTime->Year; + aValue.Day = pDateTime->Day; + aValue.Month = pDateTime->Month; + aValue.Year = pDateTime->Year; } break; default: @@ -1799,7 +1799,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const return aValue; } // ----------------------------------------------------------------------------- -::com::sun::star::util::Time ORowSetValue::getTime() const +::com::sun::star::util::Time ORowSetValue::getTime() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getTime" ); ::com::sun::star::util::Time aValue; @@ -1824,10 +1824,10 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const case DataType::TIMESTAMP: { ::com::sun::star::util::DateTime* pDateTime = static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue); - aValue.HundredthSeconds = pDateTime->HundredthSeconds; - aValue.Seconds = pDateTime->Seconds; - aValue.Minutes = pDateTime->Minutes; - aValue.Hours = pDateTime->Hours; + aValue.HundredthSeconds = pDateTime->HundredthSeconds; + aValue.Seconds = pDateTime->Seconds; + aValue.Minutes = pDateTime->Minutes; + aValue.Hours = pDateTime->Hours; } break; case DataType::TIME: @@ -1844,7 +1844,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const return aValue; } // ----------------------------------------------------------------------------- -::com::sun::star::util::DateTime ORowSetValue::getDateTime() const +::com::sun::star::util::DateTime ORowSetValue::getDateTime() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getDateTime" ); ::com::sun::star::util::DateTime aValue; @@ -1869,18 +1869,18 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const case DataType::DATE: { ::com::sun::star::util::Date* pDate = static_cast< ::com::sun::star::util::Date*>(m_aValue.m_pValue); - aValue.Day = pDate->Day; - aValue.Month = pDate->Month; - aValue.Year = pDate->Year; + aValue.Day = pDate->Day; + aValue.Month = pDate->Month; + aValue.Year = pDate->Year; } break; case DataType::TIME: { ::com::sun::star::util::Time* pTime = static_cast< ::com::sun::star::util::Time*>(m_aValue.m_pValue); - aValue.HundredthSeconds = pTime->HundredthSeconds; - aValue.Seconds = pTime->Seconds; - aValue.Minutes = pTime->Minutes; - aValue.Hours = pTime->Hours; + aValue.HundredthSeconds = pTime->HundredthSeconds; + aValue.Seconds = pTime->Seconds; + aValue.Minutes = pTime->Minutes; + aValue.Hours = pTime->Hours; } break; case DataType::TIMESTAMP: @@ -1982,9 +1982,9 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const = 0; virtual Reference< XInputStream > getBinaryStream() const = 0; virtual Reference< XInputStream > getCharacterStream() const = 0; - virtual Reference< XBlob > getBlob() const = 0; - virtual Reference< XClob > getClob() const = 0; - virtual Any getObject() const = 0; + virtual Reference< XBlob > getBlob() const = 0; + virtual Reference< XClob > getClob() const = 0; + virtual Any getObject() const = 0; virtual sal_Bool wasNull() const = 0; virtual ~IValueSource() { } @@ -2014,9 +2014,9 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const { return m_xRow->getBytes( m_nPos ); }; virtual Reference< XInputStream > getBinaryStream() const { return m_xRow->getBinaryStream( m_nPos ); }; virtual Reference< XInputStream > getCharacterStream() const { return m_xRow->getCharacterStream( m_nPos ); }; - virtual Reference< XBlob > getBlob() const { return m_xRow->getBlob( m_nPos ); }; - virtual Reference< XClob > getClob() const { return m_xRow->getClob( m_nPos ); }; - virtual Any getObject() const { return m_xRow->getObject( m_nPos ,NULL); }; + virtual Reference< XBlob > getBlob() const { return m_xRow->getBlob( m_nPos ); }; + virtual Reference< XClob > getClob() const { return m_xRow->getClob( m_nPos ); }; + virtual Any getObject() const { return m_xRow->getObject( m_nPos ,NULL); }; virtual sal_Bool wasNull() const { return m_xRow->wasNull( ); }; private: @@ -2047,8 +2047,8 @@ namespace detail virtual Sequence< sal_Int8 > getBytes() const { return m_xColumn->getBytes(); }; virtual Reference< XInputStream > getBinaryStream() const { return m_xColumn->getBinaryStream(); }; virtual Reference< XInputStream > getCharacterStream() const { return m_xColumn->getCharacterStream(); }; - virtual Reference< XBlob > getBlob() const { return m_xColumn->getBlob(); }; - virtual Reference< XClob > getClob() const { return m_xColumn->getClob(); }; + virtual Reference< XBlob > getBlob() const { return m_xColumn->getBlob(); }; + virtual Reference< XClob > getClob() const { return m_xColumn->getClob(); }; virtual Any getObject() const { return m_xColumn->getObject( NULL ); }; virtual sal_Bool wasNull() const { return m_xColumn->wasNull( ); }; @@ -2324,7 +2324,7 @@ void ORowSetValue::fill(const Any& _rValue) } } break; - + default: OSL_ENSURE(0,"Unknown type"); break; diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index 3cbf44a64eab..3d20ad6eb8b5 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.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 @@ -102,7 +102,7 @@ namespace connectivity ::rtl::OUString sNewSql; OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText); if(pNode) - { // special handling for parameters + { // special handling for parameters OSQLParseNode::substituteParameterNames(pNode); pNode->parseNodeToStr( sNewSql, xConnection ); delete pNode; diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index 40e119419f2d..590cfb648934 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.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 @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -// Makes parser a static resource, +// Makes parser a static resource, // we're synchronized externally. // But watch out, the parser might have // state not visible to this code! @@ -97,9 +97,9 @@ public: */ class BinaryFunctionExpression : public ExpressionNode { - const ExpressionFunct meFunct; - ExpressionNodeSharedPtr mpFirstArg; - ExpressionNodeSharedPtr mpSecondArg; + const ExpressionFunct meFunct; + ExpressionNodeSharedPtr mpFirstArg; + ExpressionNodeSharedPtr mpSecondArg; public: @@ -113,7 +113,7 @@ public: { ORowSetValueDecoratorRef aRet; switch(meFunct) - { + { case ENUM_FUNC_EQUATION: aRet = new ORowSetValueDecorator(sal_Bool(mpFirstArg->evaluate(_aRow )->getValue() == mpSecondArg->evaluate(_aRow )->getValue()) ); break; @@ -131,7 +131,7 @@ public: virtual void fill(const ODatabaseMetaDataResultSet::ORow& _aRow ) const { switch(meFunct) - { + { case ENUM_FUNC_EQUATION: (*mpFirstArg->evaluate(_aRow )) = mpSecondArg->evaluate(_aRow )->getValue(); break; @@ -168,7 +168,7 @@ struct ParserContext // arguments from. If all arguments to an operator are constant, // the operator pushes a precalculated result on the stack, and // a composite ExpressionNode otherwise. - OperandStack maOperandStack; + OperandStack maOperandStack; }; typedef ::boost::shared_ptr< ParserContext > ParserContextSharedPtr; @@ -178,7 +178,7 @@ typedef ::boost::shared_ptr< ParserContext > ParserContextSharedPtr; class ConstantFunctor { - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mpContext; public: @@ -197,7 +197,7 @@ public: */ class IntConstantFunctor { - ParserContextSharedPtr mpContext; + ParserContextSharedPtr mpContext; public: IntConstantFunctor( const ParserContextSharedPtr& rContext ) : @@ -220,12 +220,12 @@ public: @tpl Generator Generator functor, to generate an ExpressionNode of appropriate type - + */ class BinaryFunctionFunctor { - const ExpressionFunct meFunct; - ParserContextSharedPtr mpContext; + const ExpressionFunct meFunct; + ParserContextSharedPtr mpContext; public: @@ -259,8 +259,8 @@ public: */ class UnaryFunctionExpression : public ExpressionNode { - const ExpressionFunct meFunct; - ExpressionNodeSharedPtr mpArg; + const ExpressionFunct meFunct; + ExpressionNodeSharedPtr mpArg; public: UnaryFunctionExpression( const ExpressionFunct eFunct, const ExpressionNodeSharedPtr& rArg ) : @@ -288,11 +288,11 @@ public: class UnaryFunctionFunctor { - const ExpressionFunct meFunct; - ParserContextSharedPtr mpContext; + const ExpressionFunct meFunct; + ParserContextSharedPtr mpContext; public : - + UnaryFunctionFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : meFunct( eFunct ), mpContext( rContext ) @@ -300,7 +300,7 @@ public : } void operator()( StringIteratorT, StringIteratorT ) const { - + ParserContext::OperandStack& rNodeStack( mpContext->maOperandStack ); if( rNodeStack.size() < 1 ) @@ -318,20 +318,20 @@ public : less literally written down below, only slightly obfuscated by the parser actions): - basic_expression = - number | - '(' additive_expression ')' - - unary_expression = + basic_expression = + number | + '(' additive_expression ')' + + unary_expression = basic_expression - - multiplicative_expression = - unary_expression ( ( '*' unary_expression )* | + + multiplicative_expression = + unary_expression ( ( '*' unary_expression )* | ( '/' unary_expression )* ) - - additive_expression = - multiplicative_expression ( ( '+' multiplicative_expression )* | - ( '-' multiplicative_expression )* ) + + additive_expression = + multiplicative_expression ( ( '+' multiplicative_expression )* | + ( '-' multiplicative_expression )* ) */ class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar > @@ -364,29 +364,29 @@ public: using ::boost::spirit::as_lower_d; using ::boost::spirit::strlit; using ::boost::spirit::inhibit_case; - + typedef inhibit_case<strlit<> > token_t; token_t COLUMN = as_lower_d[ "column" ]; token_t OR_ = as_lower_d[ "or" ]; token_t AND_ = as_lower_d[ "and" ]; - integer = + integer = int_p [IntConstantFunctor(self.getContext())]; - argument = + argument = integer | lexeme_d[ +( range_p('a','z') | range_p('A','Z') | range_p('0','9') ) ] [ ConstantFunctor(self.getContext()) ] ; - unaryFunction = + unaryFunction = (COLUMN >> '(' >> integer >> ')' ) [ UnaryFunctionFunctor( UNARY_FUNC_COLUMN, self.getContext()) ] ; - assignment = + assignment = unaryFunction >> ch_p('=') >> argument [ BinaryFunctionFunctor( ENUM_FUNC_EQUATION, self.getContext()) ] ; @@ -397,12 +397,12 @@ public: | ( assignment >> AND_ >> assignment ) [ BinaryFunctionFunctor( ENUM_FUNC_AND, self.getContext()) ] ; - orExpression = + orExpression = andExpression | ( orExpression >> OR_ >> andExpression ) [ BinaryFunctionFunctor( ENUM_FUNC_OR, self.getContext()) ] ; - basicExpression = + basicExpression = orExpression ; @@ -419,16 +419,16 @@ public: { return basicExpression; } - + private: - // the constituents of the Spirit arithmetic expression grammar. + // the constituents of the Spirit arithmetic expression grammar. // For the sake of readability, without 'ma' prefix. - ::boost::spirit::rule< ScannerT > basicExpression; - ::boost::spirit::rule< ScannerT > unaryFunction; - ::boost::spirit::rule< ScannerT > assignment; - ::boost::spirit::rule< ScannerT > integer,argument; - ::boost::spirit::rule< ScannerT > orExpression,andExpression; - }; + ::boost::spirit::rule< ScannerT > basicExpression; + ::boost::spirit::rule< ScannerT > unaryFunction; + ::boost::spirit::rule< ScannerT > assignment; + ::boost::spirit::rule< ScannerT > integer,argument; + ::boost::spirit::rule< ScannerT > orExpression,andExpression; + }; const ParserContextSharedPtr& getContext() const { @@ -436,15 +436,15 @@ public: } private: - ParserContextSharedPtr mpParserContext; // might get modified during parsing + ParserContextSharedPtr mpParserContext; // might get modified during parsing }; - + #ifdef BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE const ParserContextSharedPtr& getParserContext() { static ParserContextSharedPtr lcl_parserContext( new ParserContext() ); - // clear node stack (since we reuse the static object, that's + // clear node stack (since we reuse the static object, that's // the whole point here) while( !lcl_parserContext->maOperandStack.empty() ) lcl_parserContext->maOperandStack.pop(); @@ -456,10 +456,10 @@ const ParserContextSharedPtr& getParserContext() ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& _sFunction) { - // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* - // gives better conversion robustness here (we might want to map space + // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_* + // gives better conversion robustness here (we might want to map space // etc. to ASCII space here) - const ::rtl::OString& rAsciiFunction( + const ::rtl::OString& rAsciiFunction( rtl::OUStringToOString( _sFunction, RTL_TEXTENCODING_ASCII_US ) ); StringIteratorT aStart( rAsciiFunction.getStr() ); @@ -477,7 +477,7 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& _s ExpressionGrammar aExpressionGrammer( pContext ); - const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( + const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( ::boost::spirit::parse( aStart, aEnd, aExpressionGrammer, @@ -489,7 +489,7 @@ ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& _s if( !aParseInfo.full ) throw ParseError( "RowFunctionParser::parseFunction(): string not fully parseable" ); - // parser's state stack now must contain exactly _one_ ExpressionNode, + // parser's state stack now must contain exactly _one_ ExpressionNode, // which represents our formula. if( pContext->maOperandStack.size() != 1 ) throw ParseError( "RowFunctionParser::parseFunction(): incomplete or empty expression" ); diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 691a0c48d084..09d87b6abe58 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.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 @@ -71,7 +71,7 @@ namespace connectivity }; } -OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent +OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -97,10 +97,10 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) if ( !m_pImpl ) m_pImpl = new OColumnsHelperImpl(isCaseSensitive()); - sal_Bool bQueryInfo = sal_True; + sal_Bool bQueryInfo = sal_True; sal_Bool bAutoIncrement = sal_False; - sal_Bool bIsCurrency = sal_False; - sal_Int32 nDataType = DataType::OTHER; + sal_Bool bIsCurrency = sal_False; + sal_Int32 nDataType = DataType::OTHER; ColumnInformationMap::iterator aFind = m_pImpl->m_aColumnInfo.find(_rName); if ( aFind == m_pImpl->m_aColumnInfo.end() ) // we have to fill it @@ -111,10 +111,10 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) } if ( aFind != m_pImpl->m_aColumnInfo.end() ) { - bQueryInfo = sal_False; - bAutoIncrement = aFind->second.first.first; - bIsCurrency = aFind->second.first.second; - nDataType = aFind->second.second; + bQueryInfo = sal_False; + bAutoIncrement = aFind->second.first.first; + bIsCurrency = aFind->second.first.second; + nDataType = aFind->second.second; } // if ( aFind != m_pImpl->m_aColumnInfo.end() ) sdbcx::ObjectType xRet; @@ -146,7 +146,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName) else { - xRet.set(::dbtools::createSDBCXColumn( m_pTable, + xRet.set(::dbtools::createSDBCXColumn( m_pTable, xConnection, _rName, isCaseSensitive(), @@ -163,7 +163,7 @@ void OColumnsHelper::impl_refresh() throw(RuntimeException) { if ( m_pTable ) { - m_pImpl->m_aColumnInfo.clear(); + m_pImpl->m_aColumnInfo.clear(); m_pTable->refreshColumns(); } } @@ -182,13 +182,13 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName return cloneDescriptor( descriptor ); Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData(); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); - ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); + ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); aSql += ::rtl::OUString::createFromAscii(" ADD "); aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern()); - + Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); if ( xStmt.is() ) { @@ -204,9 +204,9 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem OSL_ENSURE(m_pTable,"OColumnsHelper::dropByName: Table is null!"); if ( m_pTable && !m_pTable->isNew() ) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData(); - ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); + ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( ); aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true ); aSql += ::rtl::OUString::createFromAscii(" DROP "); diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx index a0808ae5e852..b0747dfae28e 100644 --- a/connectivity/source/commontools/TConnection.cxx +++ b/connectivity/source/commontools/TConnection.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 @@ -42,8 +42,8 @@ using namespace com::sun::star::beans; using namespace ::osl; //------------------------------------------------------------------------------ -OMetaConnection::OMetaConnection() - : OMetaConnection_BASE(m_aMutex) +OMetaConnection::OMetaConnection() + : OMetaConnection_BASE(m_aMutex) , m_nTextEncoding(RTL_TEXTENCODING_MS_1252) { } @@ -54,7 +54,7 @@ void OMetaConnection::disposing() m_xMetaData = WeakReference< XDatabaseMetaData>(); for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i) { - try + try { Reference< XInterface > xStatement( i->get() ); ::comphelper::disposeComponent( xStatement ); diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx index 86d89d8698b7..407cdc8fb0ab 100644 --- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx +++ b/connectivity/source/commontools/TDatabaseMetaDataBase.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 @@ -103,7 +103,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ ::comphelper::SequenceAsHashMap aMap(m_aConnectionInfo); Sequence< Any > aTypeInfoSettings; aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings")),aTypeInfoSettings); - + if ( xRow.is() ) { static sal_Int32 pTypes[] = { @@ -130,7 +130,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ if ( aTypeInfoSettings.getLength() > 1 && ((aTypeInfoSettings.getLength() % 2) == 0) ) { const Any* pIter = aTypeInfoSettings.getConstArray(); - const Any* pEnd = pIter + aTypeInfoSettings.getLength(); + const Any* pEnd = pIter + aTypeInfoSettings.getLength(); try { for(;pIter != pEnd;++pIter) @@ -156,7 +156,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ aValue.fill(i,*pType,xRow); aRow.push_back(new ORowSetValueDecorator(aValue)); } - + ::std::vector<ExpressionNodeSharedPtr>::iterator aIter = aConditions.begin(); ::std::vector<ExpressionNodeSharedPtr>::iterator aEnd = aConditions.end(); for (; aIter != aEnd; ++aIter) diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx index 104f2c49ebf5..eb86675dd685 100644 --- a/connectivity/source/commontools/TIndex.cxx +++ b/connectivity/source/commontools/TIndex.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 @@ -39,20 +39,20 @@ using namespace connectivity; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex(sal_True) +OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex(sal_True) , m_pTable(_pTable) { construct(); ::std::vector< ::rtl::OUString> aVector; - m_pColumns = new OIndexColumns(this,m_aMutex,aVector); + m_pColumns = new OIndexColumns(this,m_aMutex,aVector); } // ------------------------------------------------------------------------- -OIndexHelper::OIndexHelper( OTableHelper* _pTable, +OIndexHelper::OIndexHelper( OTableHelper* _pTable, const ::rtl::OUString& _Name, const ::rtl::OUString& _Catalog, sal_Bool _isUnique, @@ -80,9 +80,9 @@ void OIndexHelper::refreshColumns() { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; - + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + Reference< XResultSet > xResult = m_pTable->getMetaData()->getIndexInfo( m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), aSchema,aTable,sal_False,sal_False); @@ -105,7 +105,7 @@ void OIndexHelper::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new OIndexColumns(this,m_aMutex,aVector); + m_pColumns = new OIndexColumns(this,m_aMutex,aVector); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index c601eb2ecbfa..09fd1a773df8 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.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 @@ -43,12 +43,12 @@ using namespace connectivity; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OIndexColumns::OIndexColumns( OIndexHelper* _pIndex, +OIndexColumns::OIndexColumns( OIndexHelper* _pIndex, ::osl::Mutex& _rMutex, const ::std::vector< ::rtl::OUString> &_rVector) : connectivity::sdbcx::OCollection(*_pIndex,sal_True,_rMutex,_rVector) @@ -60,8 +60,8 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; Reference< XResultSet > xResult = m_pIndex->getTable()->getConnection()->getMetaData()->getIndexInfo( m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), @@ -94,8 +94,8 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) sal_Int32 nDataType = xRow->getInt(5); ::rtl::OUString aTypeName(xRow->getString(6)); sal_Int32 nSize = xRow->getInt(7); - sal_Int32 nDec = xRow->getInt(9); - sal_Int32 nNull = xRow->getInt(11); + sal_Int32 nDec = xRow->getInt(9); + sal_Int32 nNull = xRow->getInt(11); ::rtl::OUString aColumnDef(xRow->getString(13)); OIndexColumn* pRet = new OIndexColumn(bAsc, diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 564d36b2bece..c13cd2eebaef 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.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 @@ -53,7 +53,7 @@ typedef connectivity::sdbcx::OCollection OCollection_TYPE; OIndexesHelper::OIndexesHelper(OTableHelper* _pTable, ::osl::Mutex& _rMutex, const ::std::vector< ::rtl::OUString> &_rVector - ) + ) : OCollection(*_pTable,sal_True,_rMutex,_rVector) ,m_pTable(_pTable) { @@ -71,16 +71,16 @@ sdbcx::ObjectType OIndexesHelper::createObject(const ::rtl::OUString& _rName) sal_Int32 nLen = _rName.indexOf('.'); if ( nLen != -1 ) { - aQualifier = _rName.copy(0,nLen); - aName = _rName.copy(nLen+1); + aQualifier = _rName.copy(0,nLen); + aName = _rName.copy(nLen+1); } else - aName = _rName; - + aName = _rName; + ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; Any aCatalog = m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)); Reference< XResultSet > xResult = m_pTable->getMetaData()->getIndexInfo(aCatalog,aSchema,aTable,sal_False,sal_False); @@ -149,18 +149,18 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUStringBuffer aSql( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATE "))); - ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString aDot = ::rtl::OUString::createFromAscii("."); + ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aDot = ::rtl::OUString::createFromAscii("."); if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE)))) aSql.appendAscii("UNIQUE "); aSql.appendAscii("INDEX "); - + ::rtl::OUString aCatalog,aSchema,aTable; dbtools::qualifiedNameComponents(m_pTable->getMetaData(),m_pTable->getName(),aCatalog,aSchema,aTable,::dbtools::eInDataManipulation); ::rtl::OUString aComposedName; - + aComposedName = dbtools::composeTableName(m_pTable->getMetaData(),aCatalog,aSchema,aTable,sal_True,::dbtools::eInIndexDefinitions); if ( _rForName.getLength() ) { @@ -178,12 +178,12 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName { xColProp.set(xColumns->getByIndex(i),UNO_QUERY); aSql.append(::dbtools::quoteName( aQuote,comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))))); - + if ( bAddIndexAppendix ) - { + { - aSql.appendAscii(any2bool(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISASCENDING))) - ? + aSql.appendAscii(any2bool(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISASCENDING))) + ? " ASC" : " DESC"); @@ -236,9 +236,9 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem sal_Int32 nLen = _sElementName.indexOf('.'); if(nLen != -1) aSchema = _sElementName.copy(0,nLen); - aName = _sElementName.copy(nLen+1); + aName = _sElementName.copy(nLen+1); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP INDEX "); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP INDEX "); ::rtl::OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true ); ::rtl::OUString sIndexName,sTemp; diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx index 2efd87fc2c5e..83d83d2c8229 100644 --- a/connectivity/source/commontools/TKey.cxx +++ b/connectivity/source/commontools/TKey.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 @@ -40,7 +40,7 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -51,7 +51,7 @@ OTableKeyHelper::OTableKeyHelper(OTableHelper* _pTable) : connectivity::sdbcx::O construct(); } // ------------------------------------------------------------------------- -OTableKeyHelper::OTableKeyHelper( OTableHelper* _pTable +OTableKeyHelper::OTableKeyHelper( OTableHelper* _pTable ,const ::rtl::OUString& _Name ,const sdbcx::TKeyProperties& _rProps ) : connectivity::sdbcx::OKey(_Name,_rProps,sal_True) @@ -74,8 +74,8 @@ void OTableKeyHelper::refreshColumns() { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; if ( m_Name.getLength() ) // foreign key { @@ -94,7 +94,7 @@ void OTableKeyHelper::refreshColumns() } } } - + if ( aVector.empty() ) { const Reference< XResultSet > xResult = m_pTable->getMetaData()->getPrimaryKeys(m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)), @@ -114,7 +114,7 @@ void OTableKeyHelper::refreshColumns() if ( m_pColumns ) m_pColumns ->reFill(aVector); else - m_pColumns = new OKeyColumnsHelper(this,m_aMutex,aVector); + m_pColumns = new OKeyColumnsHelper(this,m_aMutex,aVector); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index 297b91974682..ffacd2e16ba5 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.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 @@ -43,13 +43,13 @@ using namespace connectivity; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OKeyColumnsHelper::OKeyColumnsHelper( OTableKeyHelper* _pKey, +OKeyColumnsHelper::OKeyColumnsHelper( OTableKeyHelper* _pKey, ::osl::Mutex& _rMutex, const ::std::vector< ::rtl::OUString> &_rVector) : connectivity::sdbcx::OCollection(*_pKey,sal_True,_rMutex,_rVector) @@ -61,8 +61,8 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; // frist get the related column to _rName Reference< XResultSet > xResult = m_pKey->getTable()->getMetaData()->getImportedKeys( @@ -100,8 +100,8 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName) sal_Int32 nDataType = xRow->getInt(5); ::rtl::OUString aTypeName(xRow->getString(6)); sal_Int32 nSize = xRow->getInt(7); - sal_Int32 nDec = xRow->getInt(9); - sal_Int32 nNull = xRow->getInt(11); + sal_Int32 nDec = xRow->getInt(9); + sal_Int32 nNull = xRow->getInt(11); ::rtl::OUString sColumnDef; try { diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 01d2be6d087f..1bfd8d111d80 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.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 @@ -54,7 +54,7 @@ using namespace ::com::sun::star::lang; -OKeysHelper::OKeysHelper( OTableHelper* _pTable, +OKeysHelper::OKeysHelper( OTableHelper* _pTable, ::osl::Mutex& _rMutex, const TStringVector& _rVector ) : OKeys_BASE(*_pTable,sal_True,_rMutex,_rVector,sal_True) @@ -149,7 +149,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c } const ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))); + sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))); sal_Int32 nUpdateRule = 0, nDeleteRule = 0; ::rtl::OUString sReferencedName; @@ -170,8 +170,8 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c // In this case, really append the new index. ::rtl::OUStringBuffer aSql; aSql.appendAscii("ALTER TABLE "); - ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( ); - ::rtl::OUString aDot = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); + ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aDot = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); aSql.append(composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable, ::dbtools::eInTableDefinitions, false, false, true )); aSql.appendAscii(" ADD "); @@ -196,7 +196,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c aSql.appendAscii(","); ::cppu::extractInterface(xColProp,xColumns->getByIndex(i)); aSql.append( ::dbtools::quoteName( aQuote,getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)))) ); - + } aSql.appendAscii(")"); @@ -212,11 +212,11 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c aSql.appendAscii(","); xColumns->getByIndex(i) >>= xColProp; aSql.append(::dbtools::quoteName( aQuote,getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_RELATEDCOLUMN))))); - + } aSql.appendAscii(")"); - aSql.append(getKeyRuleString(sal_True ,nUpdateRule)); - aSql.append(getKeyRuleString(sal_False ,nDeleteRule)); + aSql.append(getKeyRuleString(sal_True ,nUpdateRule)); + aSql.append(getKeyRuleString(sal_False ,nDeleteRule)); } Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement( ); @@ -227,9 +227,9 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c try { ::rtl::OUString aSchema,aTable; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; - Reference< XResultSet > xResult; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + Reference< XResultSet > xResult; sal_Int32 nColumn = 12; if ( nKeyType == KeyType::FOREIGN ) xResult = m_pTable->getMetaData()->getImportedKeys( m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) @@ -303,7 +303,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName else { aSql.append(getDropForeignKey()); - const ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(); + const ::rtl::OUString aQuote = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(); aSql.append( ::dbtools::quoteName( aQuote,_sElementName) ); } diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx index a9e21fb27ec3..4cbceb03e85e 100644 --- a/connectivity/source/commontools/TPrivilegesResultSet.cxx +++ b/connectivity/source/commontools/TPrivilegesResultSet.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 @@ -56,7 +56,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& sTableTypes.realloc(3); sTableTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")); sTableTypes[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")); - sTableTypes[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); // just to be sure to include anything else .... + sTableTypes[2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")); // just to be sure to include anything else .... } try { diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx index 4fd8d9cf1772..005967d4a6cd 100644 --- a/connectivity/source/commontools/TSkipDeletedSet.cxx +++ b/connectivity/source/commontools/TSkipDeletedSet.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 @@ -60,7 +60,7 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio { case IResultSetHelper::ABSOLUTE: return moveAbsolute(_nOffset,_bRetrieveData); - case IResultSetHelper::FIRST: // set the movement when positioning failed + case IResultSetHelper::FIRST: // set the movement when positioning failed eDelPosition = IResultSetHelper::NEXT; nDelOffset = 1; break; @@ -75,8 +75,8 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio break; } - sal_Bool bDone = sal_True; - sal_Bool bDataFound = sal_False; + sal_Bool bDone = sal_True; + sal_Bool bDataFound = sal_False; if (_eCursorPosition == IResultSetHelper::LAST) { @@ -105,7 +105,7 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio { bDataFound = m_pHelper->move(IResultSetHelper::NEXT, 1, sal_False); // we don't need the data here if( bDataFound && ( m_bDeletedVisible || !m_pHelper->isRowDeleted()) ) - { // we weren't on the last row we remember it and move on + { // we weren't on the last row we remember it and move on m_aBookmarksPositions.push_back(m_pHelper->getDriverPos()); //m_aBookmarksPositions.push_back(m_aBookmarks.insert(TInt2IntMap::value_type(m_pHelper->getDriverPos(),m_aBookmarksPositions.size()+1)).first); } @@ -193,12 +193,12 @@ sal_Bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,sal_Bool _bRetrieveData) } // if ( m_aBookmarksPositions.empty() ) else { - nLastBookmark = (*m_aBookmarksPositions.rbegin())/*->first*/; - nCurPos = /*(**/m_aBookmarksPositions.size()/*->second*/; - nNewPos = nNewPos - nCurPos; - bDataFound = m_pHelper->move(IResultSetHelper::BOOKMARK, nLastBookmark, _bRetrieveData); + nLastBookmark = (*m_aBookmarksPositions.rbegin())/*->first*/; + nCurPos = /*(**/m_aBookmarksPositions.size()/*->second*/; + nNewPos = nNewPos - nCurPos; + bDataFound = m_pHelper->move(IResultSetHelper::BOOKMARK, nLastBookmark, _bRetrieveData); } - + // now move to that row we need and don't count deleted rows while (bDataFound && nNewPos) { diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 6f9022dd0b8a..31fe65d048bf 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.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 @@ -43,7 +43,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v { } // return false if compared values are equal otherwise true - inline bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs) const + inline bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs) const { const ::std::vector<OKeyType>& aKeyType = pIndex->getKeyType(); ::std::vector<OKeyType>::const_iterator aIter = aKeyType.begin(); @@ -100,7 +100,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v return pKeySet; } // ----------------------------------------------------------------------------- -OSortIndex::OSortIndex( const ::std::vector<OKeyType>& _aKeyType, +OSortIndex::OSortIndex( const ::std::vector<OKeyType>& _aKeyType, const ::std::vector<TAscendingOrder>& _aAscending) :m_aKeyType(_aKeyType) ,m_aAscending(_aAscending) diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 0ed36cbfd27a..8cd621cea42f 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.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 @@ -56,7 +56,7 @@ using namespace ::com::sun::star::lang; namespace { /// helper class for column property change events which holds the OComponentDefinition weak -typedef ::cppu::WeakImplHelper1 < XContainerListener > OTableContainerListener_BASE; +typedef ::cppu::WeakImplHelper1 < XContainerListener > OTableContainerListener_BASE; class OTableContainerListener : public OTableContainerListener_BASE { OTableHelper* m_pComponent; @@ -74,15 +74,15 @@ public: virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException) { ::rtl::OUString sName; - Event.Accessor >>= sName; + Event.Accessor >>= sName; if ( m_aRefNames.find(sName) != m_aRefNames.end() ) m_pComponent->refreshKeys(); } virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException) { ::rtl::OUString sOldComposedName,sNewComposedName; - Event.ReplacedElement >>= sOldComposedName; - Event.Accessor >>= sNewComposedName; + Event.ReplacedElement >>= sOldComposedName; + Event.Accessor >>= sNewComposedName; if ( sOldComposedName != sNewComposedName && m_aRefNames.find(sOldComposedName) != m_aRefNames.end() ) m_pComponent->refreshKeys(); } @@ -114,10 +114,10 @@ namespace connectivity Reference< ::com::sun::star::sdb::tools::XTableAlteration> m_xAlter; Reference< ::com::sun::star::sdb::tools::XKeyAlteration> m_xKeyAlter; Reference< ::com::sun::star::sdb::tools::XIndexAlteration> m_xIndexAlter; - - Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener> + + Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + ::comphelper::ImplementationReference< OTableContainerListener,XContainerListener> m_xTablePropertyListener; ::std::vector< ColumnDesc > m_aColumnDesc; OTableHelperImpl(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) @@ -146,15 +146,15 @@ namespace connectivity }; } -OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, +OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, - sal_Bool _bCase) + sal_Bool _bCase) :OTable_TYPEDEF(_pTables,_bCase) ,m_pImpl(new OTableHelperImpl(_xConnection)) -{ +{ } // ------------------------------------------------------------------------- -OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, +OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, sal_Bool _bCase, const ::rtl::OUString& _Name, @@ -187,10 +187,10 @@ void SAL_CALL OTableHelper::disposing() m_pImpl->m_xTablePropertyListener.dispose(); } OTable_TYPEDEF::disposing(); - - m_pImpl->m_xConnection = NULL; - m_pImpl->m_xMetaData = NULL; - + + m_pImpl->m_xConnection = NULL; + m_pImpl->m_xMetaData = NULL; + } // ------------------------------------------------------------------------- @@ -206,11 +206,11 @@ namespace while ( _rxResult->next() ) { sName = xRow->getString( 4 ); // COLUMN_NAME - sal_Int32 nField5 = xRow->getInt(5); + sal_Int32 nField5 = xRow->getInt(5); ::rtl::OUString aField6 = xRow->getString(6); - sal_Int32 nField7 = xRow->getInt(7) - , nField9 = xRow->getInt(9) - , nField11= xRow->getInt(11); + sal_Int32 nField7 = xRow->getInt(7) + , nField9 = xRow->getInt(9) + , nField11= xRow->getInt(11); ::rtl::OUString sField12 = xRow->getString(12) ,sField13 = xRow->getString(13); nOrdinalPosition = xRow->getInt( 17 ); // ORDINAL_POSITION @@ -309,7 +309,7 @@ void OTableHelper::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = createColumns(aVector); + m_pColumns = createColumns(aVector); } // ----------------------------------------------------------------------------- const ColumnDesc* OTableHelper::getColumnDescription(const ::rtl::OUString& _sName) const @@ -349,7 +349,7 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames) bAlreadyFetched = true; } } - + m_pImpl->m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps)); _rNames.push_back(aPkName); } // if ( xResult.is() && xResult->next() ) @@ -371,22 +371,22 @@ void OTableHelper::refreshForgeinKeys(TStringVector& _rNames) while( xResult->next() ) { // this must be outsid the "if" because we have to call in a right order - sCatalog = xRow->getString(1); + sCatalog = xRow->getString(1); if ( xRow->wasNull() ) sCatalog = ::rtl::OUString(); - aSchema = xRow->getString(2); - aName = xRow->getString(3); + aSchema = xRow->getString(2); + aName = xRow->getString(3); const ::rtl::OUString sForeignKeyColumn = xRow->getString(8); const sal_Int32 nUpdateRule = xRow->getInt(10); const sal_Int32 nDeleteRule = xRow->getInt(11); const ::rtl::OUString sFkName = xRow->getString(12); - + if ( pKeyProps.get() ) { } - - + + if ( sFkName.getLength() && !xRow->wasNull() ) { if ( sOldFKName != sFkName ) @@ -396,7 +396,7 @@ void OTableHelper::refreshForgeinKeys(TStringVector& _rNames) const ::rtl::OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,sal_False,::dbtools::eInDataManipulation); pKeyProps.reset(new sdbcx::KeyProperties(sReferencedName,KeyType::FOREIGN,nUpdateRule,nDeleteRule)); - pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn); + pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn); _rNames.push_back(sFkName); if ( m_pTables->hasByName(sReferencedName) ) { @@ -429,14 +429,14 @@ void OTableHelper::refreshKeys() { refreshPrimaryKeys(aNames); refreshForgeinKeys(aNames); - m_pKeys = createKeys(aNames); + m_pKeys = createKeys(aNames); } // if(!isNew()) else if (!m_pKeys ) - m_pKeys = createKeys(aNames); + m_pKeys = createKeys(aNames); /*if(m_pKeys) m_pKeys->reFill(aVector); else*/ - + } // ------------------------------------------------------------------------- void OTableHelper::refreshIndexes() @@ -477,7 +477,7 @@ void OTableHelper::refreshIndexes() if(m_pIndexes) m_pIndexes->reFill(aVector); else - m_pIndexes = createIndexes(aVector); + m_pIndexes = createIndexes(aVector); } // ----------------------------------------------------------------------------- ::rtl::OUString OTableHelper::getRenameStart() const @@ -496,7 +496,7 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( -#ifdef GCC +#ifdef GCC ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed #else rBHelper.bDisposed @@ -538,16 +538,16 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx ::dbtools::qualifiedNameComponents(getMetaData(),newName,m_CatalogName,m_SchemaName,m_Name,::dbtools::eInTableDefinitions); } // ----------------------------------------------------------------------------- -Reference< XDatabaseMetaData> OTableHelper::getMetaData() const -{ - return m_pImpl->m_xMetaData; +Reference< XDatabaseMetaData> OTableHelper::getMetaData() const +{ + return m_pImpl->m_xMetaData; } // ------------------------------------------------------------------------- void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed( -#ifdef GCC + checkDisposed( +#ifdef GCC ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed #else rBHelper.bDisposed @@ -604,29 +604,29 @@ void OTableHelper::addKey(const ::rtl::OUString& _sName,const sdbcx::TKeyPropert return ::rtl::OUString(); } // ----------------------------------------------------------------------------- -Reference< XConnection> OTableHelper::getConnection() const -{ - return m_pImpl->m_xConnection; +Reference< XConnection> OTableHelper::getConnection() const +{ + return m_pImpl->m_xConnection; } // ----------------------------------------------------------------------------- Reference< ::com::sun::star::sdb::tools::XTableRename> OTableHelper::getRenameService() const -{ - return m_pImpl->m_xRename; +{ + return m_pImpl->m_xRename; } // ----------------------------------------------------------------------------- Reference< ::com::sun::star::sdb::tools::XTableAlteration> OTableHelper::getAlterService() const -{ - return m_pImpl->m_xAlter; +{ + return m_pImpl->m_xAlter; } // ----------------------------------------------------------------------------- Reference< ::com::sun::star::sdb::tools::XKeyAlteration> OTableHelper::getKeyService() const -{ - return m_pImpl->m_xKeyAlter; +{ + return m_pImpl->m_xKeyAlter; } // ----------------------------------------------------------------------------- Reference< ::com::sun::star::sdb::tools::XIndexAlteration> OTableHelper::getIndexService() const -{ - return m_pImpl->m_xIndexAlter; +{ + return m_pImpl->m_xIndexAlter; } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index ab8300f66c00..8a30e0f4a486 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.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 @@ -98,7 +98,7 @@ namespace dbtools Reference< XInterface > xKeepAlive(static_cast< XWeak* >(this)); try - { // remove ourself as property change listener + { // remove ourself as property change listener OSL_ENSURE( _rxEventSource.is(), "OAutoConnectionDisposer::stopPropertyListening: invalid event source (no XPropertySet)!" ); if ( _rxEventSource.is() ) { @@ -147,7 +147,7 @@ namespace dbtools void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException) { if ( _rEvent.PropertyName.equals( getActiveConnectionPropertyName() ) ) - { // somebody set a new ActiveConnection + { // somebody set a new ActiveConnection Reference< XConnection > xNewConnection; _rEvent.NewValue >>= xNewConnection; @@ -243,7 +243,7 @@ namespace dbtools //--------------------------------------------------------------------- //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx index a51cc0eeef02..bee593f44758 100644 --- a/connectivity/source/commontools/dbcharset.cxx +++ b/connectivity/source/commontools/dbcharset.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 @@ -50,15 +50,15 @@ namespace dbtools void OCharsetMap::lateConstruct() { const rtl_TextEncoding eFirstEncoding = RTL_TEXTENCODING_DONTKNOW; - const rtl_TextEncoding eLastEncoding = 100; // TODO: a define in rtl/textenc.h would be fine here ... + const rtl_TextEncoding eLastEncoding = 100; // TODO: a define in rtl/textenc.h would be fine here ... OSL_ENSURE( 0 == eFirstEncoding, "OCharsetMap::OCharsetMap: somebody changed the numbers!" ); rtl_TextEncodingInfo aInfo; aInfo.StructSize = sizeof( rtl_TextEncodingInfo ); for ( rtl_TextEncoding eEncoding = eFirstEncoding; eEncoding < eLastEncoding; ++eEncoding ) { - if ( ( RTL_TEXTENCODING_DONTKNOW == eEncoding ) // this is always allowed - it has the special meaning "system encoding" - || ( rtl_getTextEncodingInfo( eEncoding, &aInfo ) - && approveEncoding( eEncoding, aInfo ) + if ( ( RTL_TEXTENCODING_DONTKNOW == eEncoding ) // this is always allowed - it has the special meaning "system encoding" + || ( rtl_getTextEncodingInfo( eEncoding, &aInfo ) + && approveEncoding( eEncoding, aInfo ) ) ) { @@ -103,14 +103,14 @@ namespace dbtools } //------------------------------------------------------------------------- - OCharsetMap::CharsetIterator OCharsetMap::find(const rtl_TextEncoding _eEncoding) const + OCharsetMap::CharsetIterator OCharsetMap::find(const rtl_TextEncoding _eEncoding) const { ensureConstructed( ); return CharsetIterator( this, m_aEncodings.find( _eEncoding ) ); } //------------------------------------------------------------------------- - OCharsetMap::CharsetIterator OCharsetMap::find(const ::rtl::OUString& _rIanaName, const IANA&) const + OCharsetMap::CharsetIterator OCharsetMap::find(const ::rtl::OUString& _rIanaName, const IANA&) const { ensureConstructed( ); @@ -123,7 +123,7 @@ namespace dbtools eEncoding = rtl_getTextEncodingFromMimeCharset( sMimeByteString.getStr() ); if ( RTL_TEXTENCODING_DONTKNOW == eEncoding ) - { // if we're here, the name is not empty, but unknown -> this is an invalid name + { // if we're here, the name is not empty, but unknown -> this is an invalid name return end(); } } @@ -194,7 +194,7 @@ namespace dbtools ::rtl::OUString sIanaName; if ( RTL_TEXTENCODING_DONTKNOW != eEncoding ) - { // it's not the virtual "system charset" + { // it's not the virtual "system charset" const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( eEncoding ); OSL_ENSURE( pIanaName, "OCharsetMap::CharsetIterator: invalid mime name!" ); if ( pIanaName ) @@ -204,7 +204,7 @@ namespace dbtools } //------------------------------------------------------------------------- - const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator++() + const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator++() { OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.end(), "OCharsetMap::CharsetIterator::operator++ : invalid position!" ); if ( m_aPos != m_pContainer->m_aEncodings.end()) @@ -213,7 +213,7 @@ namespace dbtools } //------------------------------------------------------------------------- - const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator--() + const OCharsetMap::CharsetIterator& OCharsetMap::CharsetIterator::operator--() { OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.begin(), "OCharsetMap::CharsetIterator::operator-- : invalid position!" ); if ( m_aPos != m_pContainer->m_aEncodings.begin() ) @@ -228,7 +228,7 @@ namespace dbtools } //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index 5b759e170f68..bc05694898f9 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.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/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index 60addf14828c..89533e389973 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.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 @@ -559,7 +559,7 @@ const sal_Char* getStandardSQLStateAscii( StandardSQLState _eState ) // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index acb995978f5a..04483aa9e9cf 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.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/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index c04c76bd7bcd..ec8688d3ed1b 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.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 @@ -121,8 +121,8 @@ namespace dbtools using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::task; -// using namespace cppu; -// using namespace osl; +// using namespace cppu; +// using namespace osl; //============================================================================== //============================================================================== @@ -173,7 +173,7 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, return NumberFormat::UNDEFINED; sal_Int32 nFormat = 0; - sal_Int32 nNumberType = _bIsCurrency ? NumberFormat::CURRENCY : NumberFormat::NUMBER; + sal_Int32 nNumberType = _bIsCurrency ? NumberFormat::CURRENCY : NumberFormat::NUMBER; switch (_nDataType) { case DataType::BIT: @@ -209,7 +209,7 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, { nFormat = _xTypes->getStandardFormat((sal_Int16)nNumberType, _rLocale); } - } break; + } break; case DataType::CHAR: case DataType::VARCHAR: case DataType::LONGVARCHAR: @@ -317,10 +317,10 @@ Reference< XConnection > getConnection_allowException( OSL_ENSURE(sal_False, "dbtools::getConnection: error while retrieving data source properties!"); } if(bPwdReq && !sPwd.getLength()) - { // password required, but empty -> connect using an interaction handler + { // password required, but empty -> connect using an interaction handler Reference<XCompletedConnection> xConnectionCompletion(xProp, UNO_QUERY); if (xConnectionCompletion.is()) - { // instantiate the default SDB interaction handler + { // instantiate the default SDB interaction handler Reference< XInteractionHandler > xHandler(_rxFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler")), UNO_QUERY); OSL_ENSURE(xHandler.is(), "dbtools::getConnection service com.sun.star.task.InteractionHandler not available!"); if (xHandler.is()) @@ -440,7 +440,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R Reference< XConnection > xPureConnection; if (sDataSourceName.getLength()) - { // the row set's data source property is set + { // the row set's data source property is set // -> try to connect, get user and pwd setting for that ::rtl::OUString sUser, sPwd; @@ -452,7 +452,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R xPureConnection = getConnection_allowException( sDataSourceName, sUser, sPwd, _rxFactory ); } else if (sURL.getLength()) - { // the row set has no data source, but a connection url set + { // the row set has no data source, but a connection url set // -> try to connection with that url Reference< XDriverManager > xDriverManager( _rxFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ConnectionPool")), UNO_QUERY); @@ -464,7 +464,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), xRowSetProps)) xRowSetProps->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd; if (sUser.getLength()) - { // use user and pwd together with the url + { // use user and pwd together with the url Sequence< PropertyValue> aInfo(2); aInfo.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")); aInfo.getArray()[0].Value <<= sUser; @@ -512,7 +512,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R //------------------------------------------------------------------------------ Reference< XConnection> connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory, - sal_Bool _bSetAsActiveConnection ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) + sal_Bool _bSetAsActiveConnection ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) { SharedConnection xConnection = lcl_connectRowSet( _rxRowSet, _rxFactory, _bSetAsActiveConnection, true ); return xConnection.getTyped(); @@ -520,7 +520,7 @@ Reference< XConnection> connectRowset(const Reference< XRowSet>& _rxRowSet, cons //------------------------------------------------------------------------------ SharedConnection ensureRowSetConnection(const Reference< XRowSet>& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory, - bool _bUseAutoConnectionDisposer ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) + bool _bUseAutoConnectionDisposer ) SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) { return lcl_connectRowSet( _rxRowSet, _rxFactory, true, _bUseAutoConnectionDisposer ); } @@ -892,8 +892,8 @@ static ::rtl::OUString impl_doComposeTableName( const Reference< XDatabaseMetaDa sal_Bool bCatlogAtStart = sal_True; if ( _rCatalog.getLength() && aNameComps.bCatalogs ) { - sCatalogSep = _rxMetaData->getCatalogSeparator(); - bCatlogAtStart = _rxMetaData->isCatalogAtStart(); + sCatalogSep = _rxMetaData->getCatalogSeparator(); + bCatlogAtStart = _rxMetaData->isCatalogAtStart(); if ( bCatlogAtStart && sCatalogSep.getLength()) { @@ -971,7 +971,7 @@ void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaDa if ( aNameComps.bSchemas ) { sal_Int32 nIndex = sName.indexOf((sal_Unicode)'.'); - // OSL_ENSURE(-1 != nIndex, "QualifiedNameComponents : no schema separator!"); + // OSL_ENSURE(-1 != nIndex, "QualifiedNameComponents : no schema separator!"); if ( nIndex != -1 ) _rSchema = sName.copy(0, nIndex); sName = sName.copy(nIndex + 1); @@ -1046,8 +1046,8 @@ try for (sal_Int16 i=0; i<aOldProperties.getLength(); ++i) { - if ( (!pOldProps[i].Name.equals(sPropDefaultControl)) - && (!pOldProps[i].Name.equals(sPropLabelControl)) + if ( (!pOldProps[i].Name.equals(sPropDefaultControl)) + && (!pOldProps[i].Name.equals(sPropLabelControl)) ) { // binaere Suche @@ -1056,7 +1056,7 @@ try && ( pResult != pNewProps + nNewLen && pResult->Name == pOldProps[i].Name ) && ( (pResult->Attributes & PropertyAttribute::READONLY) == 0 ) && ( pResult->Type.equals(pOldProps[i].Type)) ) - { // Attribute stimmen ueberein und Property ist nicht read-only + { // Attribute stimmen ueberein und Property ist nicht read-only try { xNewProps->setPropertyValue(pResult->Name, xOldProps->getPropertyValue(pResult->Name)); @@ -1083,7 +1083,7 @@ try sal_Bool bNewIsFormatted = xSI.is() && xSI->supportsService( sFormattedServiceName ); if (!bOldIsFormatted && !bNewIsFormatted) - return; // nothing to do + return; // nothing to do if (bOldIsFormatted && bNewIsFormatted) // nein, wenn beide formatierte Felder sind, dann machen wir keinerlei Konvertierungen @@ -1118,7 +1118,7 @@ try // eine eventuelle-Min-Max-Konvertierung Any aEffectiveMin( xOldProps->getPropertyValue(sPropEffectiveMin) ); if (aEffectiveMin.hasValue()) - { // im Gegensatz zu ValueMin kann EffectiveMin void sein + { // im Gegensatz zu ValueMin kann EffectiveMin void sein if (hasProperty(sPropValueMin, xNewProps)) { OSL_ENSURE(aEffectiveMin.getValueType().getTypeClass() == TypeClass_DOUBLE, @@ -1128,7 +1128,7 @@ try } Any aEffectiveMax( xOldProps->getPropertyValue(sPropEffectiveMax) ); if (aEffectiveMax.hasValue()) - { // analog + { // analog if (hasProperty(sPropValueMax, xNewProps)) { OSL_ENSURE(aEffectiveMax.getValueType().getTypeClass() == TypeClass_DOUBLE, @@ -1147,25 +1147,25 @@ try // die Effective-Properties sollten immer void oder string oder double sein .... if (hasProperty(sPropDefaultDate, xNewProps) && !bIsString) - { // (einen ::rtl::OUString in ein Datum zu konvertieren muss nicht immer klappen, denn das ganze kann ja an + { // (einen ::rtl::OUString in ein Datum zu konvertieren muss nicht immer klappen, denn das ganze kann ja an // eine Textspalte gebunden gewesen sein, aber mit einem double koennen wir was anfangen) Date aDate = DBTypeConversion::toDate(getDouble(aEffectiveDefault)); xNewProps->setPropertyValue(sPropDefaultDate, makeAny(aDate)); } if (hasProperty(sPropDefaultTime, xNewProps) && !bIsString) - { // voellig analog mit Zeit + { // voellig analog mit Zeit Time aTime = DBTypeConversion::toTime(getDouble(aEffectiveDefault)); xNewProps->setPropertyValue(sPropDefaultTime, makeAny(aTime)); } if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), xNewProps) && !bIsString) - { // hier koennen wir einfach das double durchreichen + { // hier koennen wir einfach das double durchreichen xNewProps->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), aEffectiveDefault); } if (hasProperty(sPropDefaultText, xNewProps) && bIsString) - { // und hier den ::rtl::OUString + { // und hier den ::rtl::OUString xNewProps->setPropertyValue(sPropDefaultText, aEffectiveDefault); } @@ -1222,7 +1222,7 @@ try // ... und zum FormatsSupplier hinzufuegen (wenn noetig) sal_Int32 nKey = xFormats->queryKey(sNewFormat, _rLocale, sal_False); if (nKey == (sal_Int32)-1) - { // noch nicht vorhanden in meinem Formatter ... + { // noch nicht vorhanden in meinem Formatter ... nKey = xFormats->addNew(sNewFormat, _rLocale); } @@ -1314,7 +1314,7 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent) try { Reference< XConnection> xConn = connectRowset( Reference< XRowSet >( _rxRowSet, UNO_QUERY ), _rxFactory, sal_True ); - if ( xConn.is() ) // implies _rxRowSet.is() + if ( xConn.is() ) // implies _rxRowSet.is() { // build the statement the row set is based on (can't use the ActiveCommand property of the set // as this reflects the status after the last execute, not the currently set properties) @@ -1427,20 +1427,20 @@ namespace { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); Reference< XPropertySetInfo > xInfo = _xTable->getPropertySetInfo(); - if ( xInfo.is() - && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) ) + if ( xInfo.is() + && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) ) { - + ::rtl::OUString aCatalog; ::rtl::OUString aSchema; ::rtl::OUString aTable; - if ( xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) - && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) ) + if ( xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) + && xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) ) { - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= _out_rCatalog; - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= _out_rSchema; + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= _out_rCatalog; + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= _out_rSchema; } - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= _out_rName; + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= _out_rName; } else OSL_ENSURE( false, "::dbtools::lcl_getTableNameComponents: this is no table object!" ); @@ -1655,7 +1655,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject, return bSuccessfullyReRouted; } // ------------------------------------------------------------------------- -sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, +sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, const sal_Int32 _nColumnIndex, const Any& _rValue) SAL_THROW ( ( SQLException, RuntimeException ) ) { sal_Bool bSuccessfullyReRouted = sal_True; @@ -1754,7 +1754,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters, //.................................................................. namespace { - class OParameterWrapper : public ::cppu::WeakImplHelper1< XIndexAccess > + class OParameterWrapper : public ::cppu::WeakImplHelper1< XIndexAccess > { ::std::bit_vector m_aSet; Reference<XIndexAccess> m_xSource; @@ -1833,7 +1833,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, Reference<XPropertySet> xParam(xParamsAsIndicies->getByIndex(i),UNO_QUERY); ::rtl::OUString sName; xParam->getPropertyValue(PROPERTY_NAME) >>= sName; - + TParameterPositions::iterator aFind = aParameterNames.find(sName); if ( aFind != aParameterNames.end() ) aNewParameterSet[i] = true; @@ -1889,7 +1889,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, ::std::vector<sal_Int32>::iterator aIterPos = aFind->second.begin(); ::std::vector<sal_Int32>::iterator aEndPos = aFind->second.end(); for(;aIterPos != aEndPos;++aIterPos) - { + { if ( _aParametersSet.empty() || !_aParametersSet[(*aIterPos)-1] ) { _xParameters->setObjectWithInfo(*aIterPos, pFinalValues->Value, nParamType, nScale); @@ -2084,7 +2084,7 @@ void getBoleanComparisonPredicate( const ::rtl::OUString& _rExpression, const sa } //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... //......................................................................... @@ -2124,8 +2124,8 @@ void release(oslInterlockedCount& _refCount, _xInterface = xParent; } -// // destroy the object if xHoldAlive decrement the refcount to 0 -// m_pDerivedImplementation->WEAK::release(); +// // destroy the object if xHoldAlive decrement the refcount to 0 +// m_pDerivedImplementation->WEAK::release(); } } else @@ -2139,7 +2139,7 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) } // ------------------------------------------------------------------------- - 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) @@ -2148,7 +2148,7 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) return find(__first,__last,sName,_rVal,_rCase); } // ------------------------------------------------------------------------- - 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) @@ -2157,7 +2157,7 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) return find(__first,__last,sRealName,_rVal,_rCase); } // ------------------------------------------------------------------------- - 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, diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 7c9db2d4a024..01d6aade8096 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.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 @@ -79,9 +79,9 @@ namespace dbtools ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString sTypeName; - sal_Int32 nDataType = 0; - sal_Int32 nPrecision = 0; - sal_Int32 nScale = 0; + sal_Int32 nDataType = 0; + sal_Int32 nPrecision = 0; + sal_Int32 nScale = 0; const ::rtl::OUString sQuoteString = xMetaData->getIdentifierQuoteString(); ::rtl::OUStringBuffer aSql = ::dbtools::quoteName(sQuoteString,::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)))); @@ -90,11 +90,11 @@ namespace dbtools nDataType = nPrecision = nScale = 0; sal_Bool bIsAutoIncrement = sal_False; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE)) >>= nDataType; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nPrecision; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale; - xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bIsAutoIncrement; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE)) >>= nDataType; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nPrecision; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale; + xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bIsAutoIncrement; // check if the user enter a specific string to create autoincrement values ::rtl::OUString sAutoIncrementValue; @@ -171,7 +171,7 @@ namespace dbtools ::rtl::OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE))); if ( aDefault.getLength() ) { - aSql.append(::rtl::OUString::createFromAscii(" DEFAULT ")); + aSql.append(::rtl::OUString::createFromAscii(" DEFAULT ")); aSql.append(sPreFix); aSql.append(aDefault); aSql.append(sPostFix); @@ -195,15 +195,15 @@ namespace dbtools ::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern) { - ::rtl::OUStringBuffer aSql = ::rtl::OUString::createFromAscii("CREATE TABLE "); + ::rtl::OUStringBuffer aSql = ::rtl::OUString::createFromAscii("CREATE TABLE "); ::rtl::OUString sCatalog,sSchema,sTable,sComposedName; Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData(); ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= sCatalog; - descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema; - descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= sTable; + descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= sCatalog; + descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= sSchema; + descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= sTable; sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); if ( !sComposedName.getLength() ) @@ -216,7 +216,7 @@ namespace dbtools Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY); Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY); // check if there are columns - if(!xColumns.is() || !xColumns->getCount()) + if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); Reference< XPropertySet > xColProp; @@ -238,7 +238,7 @@ namespace { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); static const ::rtl::OUString sComma(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))); - + const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString()); ::rtl::OUString sSql = ::rtl::OUString::createFromAscii(" ("); Reference< XPropertySet > xColProp; @@ -278,7 +278,7 @@ namespace if ( (xKeys->getByIndex(i) >>= xColProp) && xColProp.is() ) { - sal_Int32 nKeyType = ::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))); + sal_Int32 nKeyType = ::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE))); if ( nKeyType == KeyType::PRIMARY ) { @@ -291,7 +291,7 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); + const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); aSql.append(::rtl::OUString::createFromAscii(" PRIMARY KEY ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } @@ -302,13 +302,13 @@ namespace if(!xColumns.is() || !xColumns->getCount()) ::dbtools::throwFunctionSequenceException(_xConnection); - const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); + const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); aSql.append(::rtl::OUString::createFromAscii(" UNIQUE ")); aSql.append(generateColumnNames(xColumns,xMetaData)); } else if(nKeyType == KeyType::FOREIGN) { - sal_Int32 nDeleteRule = getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DELETERULE))); + sal_Int32 nDeleteRule = getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DELETERULE))); xColumnSup = Reference<XColumnsSupplier>(xColProp,UNO_QUERY); xColumns = Reference<XIndexAccess>(xColumnSup->getColumns(),UNO_QUERY); @@ -319,12 +319,12 @@ namespace ::rtl::OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE))); ::dbtools::qualifiedNameComponents(xMetaData, sRefTable, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); - + if ( !sComposedName.getLength() ) ::dbtools::throwFunctionSequenceException(_xConnection); @@ -365,7 +365,7 @@ namespace } // ----------------------------------------------------------------------------- -::rtl::OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descriptor, +::rtl::OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descriptor, const Reference< XConnection>& _xConnection, ISQLStatementHelper* _pHelper, const ::rtl::OUString& _sCreatePattern) @@ -383,7 +383,7 @@ namespace } return aSql; } -namespace +namespace { Reference<XPropertySet> lcl_createSDBCXColumn(const Reference<XNameAccess>& _xPrimaryKeyColumns, const Reference<XConnection>& _xConnection, @@ -410,17 +410,17 @@ namespace { if ( aMixCompare(xRow->getString(4),_rName) ) { - sal_Int32 nField5 = xRow->getInt(5); + sal_Int32 nField5 = xRow->getInt(5); ::rtl::OUString aField6 = xRow->getString(6); - sal_Int32 nField7 = xRow->getInt(7) - , nField9 = xRow->getInt(9) - , nField11= xRow->getInt(11); + sal_Int32 nField7 = xRow->getInt(7) + , nField9 = xRow->getInt(9) + , nField11= xRow->getInt(11); ::rtl::OUString sField12 = xRow->getString(12), sField13 = xRow->getString(13); ::comphelper::disposeComponent(xRow); sal_Bool bAutoIncrement = _bIsAutoIncrement - ,bIsCurrency = _bIsCurrency; + ,bIsCurrency = _bIsCurrency; if ( _bQueryForInfo ) { const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString(); @@ -433,15 +433,15 @@ namespace ColumnInformationMap::iterator aIter = aInfo.begin(); if ( aIter != aInfo.end() ) { - bAutoIncrement = aIter->second.first.first; - bIsCurrency = aIter->second.first.second; + bAutoIncrement = aIter->second.first.first; + bIsCurrency = aIter->second.first.second; if ( DataType::OTHER == nField5 ) - nField5 = aIter->second.second; + nField5 = aIter->second.second; } } else if ( DataType::OTHER == nField5 ) nField5 = _nDataType; - + if ( nField11 != ColumnValue::NO_NULLS ) { try @@ -450,7 +450,7 @@ namespace { if ( _xPrimaryKeyColumns->hasByName(_rName) ) nField11 = ColumnValue::NO_NULLS; - + } else { @@ -529,9 +529,9 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable aCatalog = _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)); ::rtl::OUString aSchema, aTable; - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; - + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + Reference<XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(_xTable); xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType); @@ -648,7 +648,7 @@ Reference< XTablesSupplier> getDataDefinitionByURLAndConnection( _rxFactory->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager") ), UNO_QUERY_THROW ); Reference< XDataDefinitionSupplier > xSupp( xManager->getDriverByURL( _rsUrl ), UNO_QUERY ); - + if ( xSupp.is() ) { xTablesSup = xSupp->getDataDefinitionByConnection( _xConnection ); @@ -681,15 +681,15 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, if ( xCurrentRow.is() ) { ::rtl::OUString sUserWorkingFor = _xMetaData->getUserName(); - static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); - static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); - static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); - static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); - static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); - static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); - static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); + static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); + static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); + static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); + static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); + static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); + static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); + static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); static const ::rtl::OUString sREFERENCE = ::rtl::OUString::createFromAscii("REFERENCE"); - static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); + static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); // after creation the set is positioned before the first record, per definitionem #ifdef DBG_UTIL Reference< XResultSetMetaDataSupplier > xSup(xPrivileges,UNO_QUERY); @@ -712,15 +712,15 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, { #ifdef DBG_UTIL ::rtl::OUString sCat, sSchema, sName, sGrantor, sGrantable; - sCat = xCurrentRow->getString(1); - sSchema = xCurrentRow->getString(2); - sName = xCurrentRow->getString(3); - sGrantor = xCurrentRow->getString(4); + sCat = xCurrentRow->getString(1); + sSchema = xCurrentRow->getString(2); + sName = xCurrentRow->getString(3); + sGrantor = xCurrentRow->getString(4); #endif - sGrantee = xCurrentRow->getString(5); - sPrivilege = xCurrentRow->getString(6); + sGrantee = xCurrentRow->getString(5); + sPrivilege = xCurrentRow->getString(6); #ifdef DBG_UTIL - sGrantable = xCurrentRow->getString(7); + sGrantable = xCurrentRow->getString(7); #endif if (!sUserWorkingFor.equalsIgnoreAsciiCase(sGrantee)) @@ -753,14 +753,14 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData, static ::rtl::OUString sNotSupportedState = ::rtl::OUString::createFromAscii("IM001"); // some drivers don't support any privileges so we assume that we are allowed to do all we want :-) if(e.SQLState == sNotSupportedState) - nPrivileges |= Privilege::DROP | - Privilege::REFERENCE | - Privilege::ALTER | - Privilege::CREATE | - Privilege::READ | - Privilege::DELETE | - Privilege::UPDATE | - Privilege::INSERT | + nPrivileges |= Privilege::DROP | + Privilege::REFERENCE | + Privilege::ALTER | + Privilege::CREATE | + Privilege::READ | + Privilege::DELETE | + Privilege::UPDATE | + Privilege::INSERT | Privilege::SELECT; else OSL_ENSURE(0,"Could not collect the privileges !"); @@ -813,7 +813,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc try { Reference< XModel > xModel = lcl_getXModel( _rxComponent ); - + if ( xModel.is() ) { Sequence< PropertyValue > aArgs = xModel->getArgs(); @@ -844,7 +844,7 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc } catch(Exception&) { - // not intereseted in + // not intereseted in } return bIsEmbedded; } @@ -881,7 +881,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc "$string$", _rSource, "$charset$", lcl_getEncodingName( _eEncoding ) ); - + throw SQLException( sMessage, NULL, @@ -970,7 +970,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& } // ----------------------------------------------------------------------------- //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 8c3153a8b974..9a01ecf275dd 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.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/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 9764287da3e1..a01581cbd32b 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.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 @@ -228,7 +228,7 @@ namespace dbtools //= FormattedColumnValue //==================================================================== //-------------------------------------------------------------------- - FormattedColumnValue::FormattedColumnValue( const ::comphelper::ComponentContext& i_rContext, + FormattedColumnValue::FormattedColumnValue( const ::comphelper::ComponentContext& i_rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& i_rColumn ) :m_pData( new FormattedColumnValue_Data ) { diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 0153586b84ab..01c604da2c84 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.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 @@ -403,7 +403,7 @@ namespace dbtools { if ( sAdditionalFilter.getLength() ) sAdditionalFilter.append(s_sAnd); - + sAdditionalFilter.appendAscii("( ",((sal_Int32)(sizeof("( ")-1))); sAdditionalFilter.append(*aComponent); sAdditionalFilter.appendAscii(" )",((sal_Int32)(sizeof(" )")-1))); @@ -558,7 +558,7 @@ namespace dbtools try { - // the master and detail field( name)s of the + // the master and detail field( name)s of the const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray(); const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray(); @@ -623,7 +623,7 @@ namespace dbtools { OSL_ENSURE( sal_False, ::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail parameter number " ) - += ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) ) + += ::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) ) += ::rtl::OString( " could not be filled!" ) ); } } @@ -822,7 +822,7 @@ namespace dbtools if ( !xParent.is() ) return false; - // the columns supplier: either from a composer, or directly from the + // the columns supplier: either from a composer, or directly from the Reference< XColumnsSupplier > xParentColSupp; if ( _bFromComposer ) { @@ -837,7 +837,7 @@ namespace dbtools else xParentColSupp = xParentColSupp.query( xParent ); - // get the columns of the parent + // get the columns of the parent if ( xParentColSupp.is() ) _out_rxParentColumns = xParentColSupp->getColumns(); } @@ -931,7 +931,7 @@ namespace dbtools ::rtl::OUString sParamColumnRealName; xInnerParameter->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME) ) >>= sParamColumnRealName; if ( xColumns->hasByName( sParamColumnRealName ) ) - { // our own columns have a column which's name equals the real name of the param column + { // our own columns have a column which's name equals the real name of the param column // -> transfer the value property xColumns->getByName( sParamColumnRealName ) >>= xDetailField; if ( xDetailField.is() ) diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index b652f2662cf9..f75733493542 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.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/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index e4ee4716d036..57f3d07678f2 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.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 @@ -142,20 +142,20 @@ namespace dbtools { OSQLParseNode* pReturn = const_cast< OSQLParser& >( m_aParser ).predicateTree( _rErrorMessage, _rStatement, m_xFormatter, _rxField ); if ( !pReturn ) - { // is it a text field ? + { // is it a text field ? sal_Int32 nType = DataType::OTHER; _rxField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= nType; - if ( ( DataType::CHAR == nType ) - || ( DataType::VARCHAR == nType ) - || ( DataType::LONGVARCHAR == nType ) - || ( DataType::CLOB == nType ) + if ( ( DataType::CHAR == nType ) + || ( DataType::VARCHAR == nType ) + || ( DataType::LONGVARCHAR == nType ) + || ( DataType::CLOB == nType ) ) - { // yes -> force a quoted text and try again + { // yes -> force a quoted text and try again ::rtl::OUString sQuoted( _rStatement ); - if ( sQuoted.getLength() - && ( (sQuoted.getStr()[0] != '\'') - || (sQuoted.getStr()[ sQuoted.getLength() - 1 ] != '\'' ) + if ( sQuoted.getLength() + && ( (sQuoted.getStr()[0] != '\'') + || (sQuoted.getStr()[ sQuoted.getLength() - 1 ] != '\'' ) ) ) { @@ -183,12 +183,12 @@ namespace dbtools // * a column formatted with an english number format // => the output is german (as we use the system locale for this), i.e. "3,4" // => the input does not recognize the german text, as predicateTree uses the number format - // of the column to determine the main locale - the locale on the context is only a fallback - if ( ( DataType::FLOAT == nType ) - || ( DataType::REAL == nType ) - || ( DataType::DOUBLE == nType ) - || ( DataType::NUMERIC == nType ) - || ( DataType::DECIMAL == nType ) + // of the column to determine the main locale - the locale on the context is only a fallback + if ( ( DataType::FLOAT == nType ) + || ( DataType::REAL == nType ) + || ( DataType::DOUBLE == nType ) + || ( DataType::NUMERIC == nType ) + || ( DataType::DECIMAL == nType ) ) { const IParseContext& rParseContext = m_aParser.getContext(); @@ -232,12 +232,12 @@ namespace dbtools sal_Bool bDecDiffers = ( nCtxDecSep != nFmtDecSep ); sal_Bool bFmtDiffers = ( nCtxThdSep != nFmtThdSep ); if ( bDecDiffers || bFmtDiffers ) - { // okay, at least one differs + { // okay, at least one differs // "translate" the value into the "format locale" ::rtl::OUString sTranslated( _rStatement ); const sal_Unicode nIntermediate( '_' ); - sTranslated = sTranslated.replace( nCtxDecSep, nIntermediate ); - sTranslated = sTranslated.replace( nCtxThdSep, nFmtThdSep ); + sTranslated = sTranslated.replace( nCtxDecSep, nIntermediate ); + sTranslated = sTranslated.replace( nCtxThdSep, nFmtThdSep ); sTranslated = sTranslated.replace( nIntermediate, nFmtDecSep ); pReturn = const_cast< OSQLParser& >( m_aParser ).predicateTree( _rErrorMessage, sTranslated, m_xFormatter, _rxField ); @@ -300,9 +300,9 @@ namespace dbtools // '-characters to the text. If we would give this to predicateTree this would add // two additional '-characters which we don't want. So check the field format. // FS - 06.01.00 - 71532 - sal_Bool bValidQuotedText = ( sValue.getLength() >= 2 ) - && ( sValue.getStr()[0] == '\'' ) - && ( sValue.getStr()[ sValue.getLength() - 1 ] == '\'' ); + sal_Bool bValidQuotedText = ( sValue.getLength() >= 2 ) + && ( sValue.getStr()[0] == '\'' ) + && ( sValue.getStr()[ sValue.getLength() - 1 ] == '\'' ); // again : as normalizePredicateString always did a conversion on the value text, // bValidQuotedText == sal_True implies that we have a text field, as no other field // values will be formatted with the quote characters @@ -335,8 +335,8 @@ namespace dbtools { if ( !_bForStatementUse ) { - if ( ( pOdbcSpec->count() >= 2 ) - && ( SQL_NODE_STRING == pOdbcSpec->getChild(1)->getNodeType() ) + if ( ( pOdbcSpec->count() >= 2 ) + && ( SQL_NODE_STRING == pOdbcSpec->getChild(1)->getNodeType() ) ) { @@ -357,7 +357,7 @@ namespace dbtools } else { - if ( pParseNode->count() >= 3 ) + if ( pParseNode->count() >= 3 ) { OSQLParseNode* pValueNode = pParseNode->getChild(2); OSL_ENSURE( pValueNode, "OPredicateInputController::getPredicateValue: invalid node child!" ); @@ -386,7 +386,7 @@ namespace dbtools return sReturn; } //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx index 09f7328be01f..ed591162e9b6 100644 --- a/connectivity/source/commontools/propertyids.cxx +++ b/connectivity/source/commontools/propertyids.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 @@ -33,76 +33,76 @@ namespace dbtools { - const sal_Char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; } - const sal_Char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; } - const sal_Char* getPROPERTY_MAXROWS() { return "MaxRows"; } - const sal_Char* getPROPERTY_CURSORNAME() { return "CursorName"; } - const sal_Char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; } - const sal_Char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; } - const sal_Char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; } - const sal_Char* getPROPERTY_FETCHSIZE() { return "FetchSize"; } - const sal_Char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; } - const sal_Char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; } - - const sal_Char* getPROPERTY_NAME() { return "Name"; } - const sal_Char* getPROPERTY_TYPE() { return "Type"; } - const sal_Char* getPROPERTY_TYPENAME() { return "TypeName"; } - const sal_Char* getPROPERTY_PRECISION() { return "Precision"; } - const sal_Char* getPROPERTY_SCALE() { return "Scale"; } - const sal_Char* getPROPERTY_ISNULLABLE() { return "IsNullable"; } - const sal_Char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; } - const sal_Char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; } - const sal_Char* getPROPERTY_DESCRIPTION() { return "Description"; } - const sal_Char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; } - - const sal_Char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; } - const sal_Char* getPROPERTY_UPDATERULE() { return "UpdateRule"; } - const sal_Char* getPROPERTY_DELETERULE() { return "DeleteRule"; } - const sal_Char* getPROPERTY_CATALOG() { return "Catalog"; } - const sal_Char* getPROPERTY_ISUNIQUE() { return "IsUnique"; } - const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; } - const sal_Char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; } - const sal_Char* getPROPERTY_ISASCENDING() { return "IsAscending"; } - const sal_Char* getPROPERTY_SCHEMANAME() { return "SchemaName"; } - const sal_Char* getPROPERTY_CATALOGNAME() { return "CatalogName"; } - const sal_Char* getPROPERTY_COMMAND() { return "Command"; } - const sal_Char* getPROPERTY_CHECKOPTION() { return "CheckOption"; } - const sal_Char* getPROPERTY_PASSWORD() { return "Password"; } - const sal_Char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; } - - const sal_Char* getPROPERTY_FUNCTION() { return "Function"; } - const sal_Char* getPROPERTY_AGGREGATEFUNCTION() { return "AggregateFunction"; } - const sal_Char* getPROPERTY_TABLENAME() { return "TableName"; } - const sal_Char* getPROPERTY_REALNAME() { return "RealName"; } - const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; } - const sal_Char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; } - const sal_Char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; } - - const sal_Char* getPROPERTY_FORMATKEY() { return "FormatKey"; } - const sal_Char* getPROPERTY_LOCALE() { return "Locale"; } - - const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; } - const sal_Char* getPROPERTY_PRIVILEGES() { return "Privileges"; } - const sal_Char* getPROPERTY_ID_HAVINGCLAUSE() { return "HavingClause"; } - const sal_Char* getPROPERTY_ID_ISSIGNED() { return "IsSigned"; } - const sal_Char* getPROPERTY_ID_ISSEARCHABLE() { return "IsSearchable"; } - - const sal_Char* getPROPERTY_ID_APPLYFILTER() { return "ApplyFilter"; } - const sal_Char* getPROPERTY_ID_FILTER() { return "Filter"; } - const sal_Char* getPROPERTY_ID_MASTERFIELDS() { return "MasterFields"; } - const sal_Char* getPROPERTY_ID_DETAILFIELDS() { return "DetailFields"; } - const sal_Char* getPROPERTY_ID_FIELDTYPE() { return "FieldType"; } - const sal_Char* getPROPERTY_ID_VALUE() { return "Value"; } - const sal_Char* getPROPERTY_ID_ACTIVE_CONNECTION() { return "ActiveConnection"; } - const sal_Char* getPROPERTY_ID_LABEL() { return "Label"; } + const sal_Char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; } + const sal_Char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; } + const sal_Char* getPROPERTY_MAXROWS() { return "MaxRows"; } + const sal_Char* getPROPERTY_CURSORNAME() { return "CursorName"; } + const sal_Char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; } + const sal_Char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; } + const sal_Char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; } + const sal_Char* getPROPERTY_FETCHSIZE() { return "FetchSize"; } + const sal_Char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; } + const sal_Char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; } + + const sal_Char* getPROPERTY_NAME() { return "Name"; } + const sal_Char* getPROPERTY_TYPE() { return "Type"; } + const sal_Char* getPROPERTY_TYPENAME() { return "TypeName"; } + const sal_Char* getPROPERTY_PRECISION() { return "Precision"; } + const sal_Char* getPROPERTY_SCALE() { return "Scale"; } + const sal_Char* getPROPERTY_ISNULLABLE() { return "IsNullable"; } + const sal_Char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; } + const sal_Char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; } + const sal_Char* getPROPERTY_DESCRIPTION() { return "Description"; } + const sal_Char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; } + + const sal_Char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; } + const sal_Char* getPROPERTY_UPDATERULE() { return "UpdateRule"; } + const sal_Char* getPROPERTY_DELETERULE() { return "DeleteRule"; } + const sal_Char* getPROPERTY_CATALOG() { return "Catalog"; } + const sal_Char* getPROPERTY_ISUNIQUE() { return "IsUnique"; } + const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; } + const sal_Char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; } + const sal_Char* getPROPERTY_ISASCENDING() { return "IsAscending"; } + const sal_Char* getPROPERTY_SCHEMANAME() { return "SchemaName"; } + const sal_Char* getPROPERTY_CATALOGNAME() { return "CatalogName"; } + const sal_Char* getPROPERTY_COMMAND() { return "Command"; } + const sal_Char* getPROPERTY_CHECKOPTION() { return "CheckOption"; } + const sal_Char* getPROPERTY_PASSWORD() { return "Password"; } + const sal_Char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; } + + const sal_Char* getPROPERTY_FUNCTION() { return "Function"; } + const sal_Char* getPROPERTY_AGGREGATEFUNCTION() { return "AggregateFunction"; } + const sal_Char* getPROPERTY_TABLENAME() { return "TableName"; } + const sal_Char* getPROPERTY_REALNAME() { return "RealName"; } + const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; } + const sal_Char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; } + const sal_Char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; } + + const sal_Char* getPROPERTY_FORMATKEY() { return "FormatKey"; } + const sal_Char* getPROPERTY_LOCALE() { return "Locale"; } + + const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; } + const sal_Char* getPROPERTY_PRIVILEGES() { return "Privileges"; } + const sal_Char* getPROPERTY_ID_HAVINGCLAUSE() { return "HavingClause"; } + const sal_Char* getPROPERTY_ID_ISSIGNED() { return "IsSigned"; } + const sal_Char* getPROPERTY_ID_ISSEARCHABLE() { return "IsSearchable"; } + + const sal_Char* getPROPERTY_ID_APPLYFILTER() { return "ApplyFilter"; } + const sal_Char* getPROPERTY_ID_FILTER() { return "Filter"; } + const sal_Char* getPROPERTY_ID_MASTERFIELDS() { return "MasterFields"; } + const sal_Char* getPROPERTY_ID_DETAILFIELDS() { return "DetailFields"; } + const sal_Char* getPROPERTY_ID_FIELDTYPE() { return "FieldType"; } + const sal_Char* getPROPERTY_ID_VALUE() { return "Value"; } + const sal_Char* getPROPERTY_ID_ACTIVE_CONNECTION() { return "ActiveConnection"; } + const sal_Char* getPROPERTY_ID_LABEL() { return "Label"; } //============================================================ //= error messages //============================================================ - const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; } - const sal_Char* getSTR_DELIMITER() { return "/"; } - + const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; } + const sal_Char* getSTR_DELIMITER() { return "/"; } + OPropertyMap::~OPropertyMap() { @@ -128,68 +128,68 @@ namespace dbtools rtl_uString* pStr = NULL; switch(_nIndex) { - case PROPERTY_ID_QUERYTIMEOUT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_QUERYTIMEOUT() ); break; } - case PROPERTY_ID_MAXFIELDSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXFIELDSIZE() ); break; } - case PROPERTY_ID_MAXROWS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXROWS() ); break; } - case PROPERTY_ID_CURSORNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CURSORNAME() ); break; } - case PROPERTY_ID_RESULTSETCONCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETCONCURRENCY() ); break; } - case PROPERTY_ID_RESULTSETTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETTYPE() ); break; } - case PROPERTY_ID_FETCHDIRECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHDIRECTION() ); break; } - case PROPERTY_ID_FETCHSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHSIZE() ); break; } - case PROPERTY_ID_ESCAPEPROCESSING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ESCAPEPROCESSING() ); break; } - case PROPERTY_ID_USEBOOKMARKS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_USEBOOKMARKS() ); break; } - // Column - case PROPERTY_ID_NAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_NAME() ); break; } - case PROPERTY_ID_TYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPE() ); break; } - case PROPERTY_ID_TYPENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPENAME() ); break; } - case PROPERTY_ID_PRECISION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRECISION() ); break; } - case PROPERTY_ID_SCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCALE() ); break; } - case PROPERTY_ID_ISNULLABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISNULLABLE() ); break; } - case PROPERTY_ID_ISAUTOINCREMENT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISAUTOINCREMENT() ); break; } - case PROPERTY_ID_ISROWVERSION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISROWVERSION() ); break; } - case PROPERTY_ID_DESCRIPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DESCRIPTION() ); break; } - case PROPERTY_ID_DEFAULTVALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DEFAULTVALUE() ); break; } - - case PROPERTY_ID_REFERENCEDTABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REFERENCEDTABLE() ); break; } - case PROPERTY_ID_UPDATERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_UPDATERULE() ); break; } - case PROPERTY_ID_DELETERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DELETERULE() ); break; } - case PROPERTY_ID_CATALOG: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOG() ); break; } - case PROPERTY_ID_ISUNIQUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISUNIQUE() ); break; } - case PROPERTY_ID_ISPRIMARYKEYINDEX: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISPRIMARYKEYINDEX() ); break; } - case PROPERTY_ID_ISCLUSTERED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCLUSTERED() ); break; } - case PROPERTY_ID_ISASCENDING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISASCENDING() ); break; } - case PROPERTY_ID_SCHEMANAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCHEMANAME() ); break; } - case PROPERTY_ID_CATALOGNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOGNAME() ); break; } - - case PROPERTY_ID_COMMAND: { rtl_uString_newFromAscii(&pStr,getPROPERTY_COMMAND() ); break; } - case PROPERTY_ID_CHECKOPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CHECKOPTION() ); break; } - case PROPERTY_ID_PASSWORD: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PASSWORD() ); break; } - case PROPERTY_ID_RELATEDCOLUMN: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RELATEDCOLUMN() ); break; } - - case PROPERTY_ID_FUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FUNCTION() ); break; } - case PROPERTY_ID_AGGREGATEFUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AGGREGATEFUNCTION() ); break; } - case PROPERTY_ID_TABLENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TABLENAME() ); break; } - case PROPERTY_ID_REALNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REALNAME() ); break; } - case PROPERTY_ID_DBASEPRECISIONCHANGED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DBASEPRECISIONCHANGED()); break; } - case PROPERTY_ID_ISCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCURRENCY() ); break; } - case PROPERTY_ID_ISBOOKMARKABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISBOOKMARKABLE() ); break; } - case PROPERTY_ID_HY010: { rtl_uString_newFromAscii(&pStr,getSQLSTATE_SEQUENCE() ); break; } - case PROPERTY_ID_DELIMITER: { rtl_uString_newFromAscii(&pStr,getSTR_DELIMITER() ); break; } - case PROPERTY_ID_FORMATKEY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FORMATKEY() ); break; } - case PROPERTY_ID_LOCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_LOCALE() ); break; } - case PROPERTY_ID_AUTOINCREMENTCREATION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AUTOINCREMENTCREATION()); break; } - case PROPERTY_ID_PRIVILEGES: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRIVILEGES() ); break; } - case PROPERTY_ID_HAVINGCLAUSE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_HAVINGCLAUSE() ); break; } - case PROPERTY_ID_ISSIGNED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSIGNED() ); break; } - case PROPERTY_ID_ISSEARCHABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSEARCHABLE() ); break; } - case PROPERTY_ID_LABEL: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_LABEL() ); break; } - case PROPERTY_ID_APPLYFILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_APPLYFILTER() ); break; } - case PROPERTY_ID_FILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FILTER() ); break; } - case PROPERTY_ID_MASTERFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_MASTERFIELDS() ); break; } - case PROPERTY_ID_DETAILFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_DETAILFIELDS() ); break; } - case PROPERTY_ID_FIELDTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FIELDTYPE() ); break; } - case PROPERTY_ID_VALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_VALUE() ); break; } - case PROPERTY_ID_ACTIVE_CONNECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ACTIVE_CONNECTION() ); break; } + case PROPERTY_ID_QUERYTIMEOUT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_QUERYTIMEOUT() ); break; } + case PROPERTY_ID_MAXFIELDSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXFIELDSIZE() ); break; } + case PROPERTY_ID_MAXROWS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_MAXROWS() ); break; } + case PROPERTY_ID_CURSORNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CURSORNAME() ); break; } + case PROPERTY_ID_RESULTSETCONCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETCONCURRENCY() ); break; } + case PROPERTY_ID_RESULTSETTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RESULTSETTYPE() ); break; } + case PROPERTY_ID_FETCHDIRECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHDIRECTION() ); break; } + case PROPERTY_ID_FETCHSIZE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FETCHSIZE() ); break; } + case PROPERTY_ID_ESCAPEPROCESSING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ESCAPEPROCESSING() ); break; } + case PROPERTY_ID_USEBOOKMARKS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_USEBOOKMARKS() ); break; } + // Column + case PROPERTY_ID_NAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_NAME() ); break; } + case PROPERTY_ID_TYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPE() ); break; } + case PROPERTY_ID_TYPENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TYPENAME() ); break; } + case PROPERTY_ID_PRECISION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRECISION() ); break; } + case PROPERTY_ID_SCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCALE() ); break; } + case PROPERTY_ID_ISNULLABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISNULLABLE() ); break; } + case PROPERTY_ID_ISAUTOINCREMENT: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISAUTOINCREMENT() ); break; } + case PROPERTY_ID_ISROWVERSION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISROWVERSION() ); break; } + case PROPERTY_ID_DESCRIPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DESCRIPTION() ); break; } + case PROPERTY_ID_DEFAULTVALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DEFAULTVALUE() ); break; } + + case PROPERTY_ID_REFERENCEDTABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REFERENCEDTABLE() ); break; } + case PROPERTY_ID_UPDATERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_UPDATERULE() ); break; } + case PROPERTY_ID_DELETERULE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DELETERULE() ); break; } + case PROPERTY_ID_CATALOG: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOG() ); break; } + case PROPERTY_ID_ISUNIQUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISUNIQUE() ); break; } + case PROPERTY_ID_ISPRIMARYKEYINDEX: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISPRIMARYKEYINDEX() ); break; } + case PROPERTY_ID_ISCLUSTERED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCLUSTERED() ); break; } + case PROPERTY_ID_ISASCENDING: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISASCENDING() ); break; } + case PROPERTY_ID_SCHEMANAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_SCHEMANAME() ); break; } + case PROPERTY_ID_CATALOGNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CATALOGNAME() ); break; } + + case PROPERTY_ID_COMMAND: { rtl_uString_newFromAscii(&pStr,getPROPERTY_COMMAND() ); break; } + case PROPERTY_ID_CHECKOPTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_CHECKOPTION() ); break; } + case PROPERTY_ID_PASSWORD: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PASSWORD() ); break; } + case PROPERTY_ID_RELATEDCOLUMN: { rtl_uString_newFromAscii(&pStr,getPROPERTY_RELATEDCOLUMN() ); break; } + + case PROPERTY_ID_FUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FUNCTION() ); break; } + case PROPERTY_ID_AGGREGATEFUNCTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AGGREGATEFUNCTION() ); break; } + case PROPERTY_ID_TABLENAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_TABLENAME() ); break; } + case PROPERTY_ID_REALNAME: { rtl_uString_newFromAscii(&pStr,getPROPERTY_REALNAME() ); break; } + case PROPERTY_ID_DBASEPRECISIONCHANGED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_DBASEPRECISIONCHANGED()); break; } + case PROPERTY_ID_ISCURRENCY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISCURRENCY() ); break; } + case PROPERTY_ID_ISBOOKMARKABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ISBOOKMARKABLE() ); break; } + case PROPERTY_ID_HY010: { rtl_uString_newFromAscii(&pStr,getSQLSTATE_SEQUENCE() ); break; } + case PROPERTY_ID_DELIMITER: { rtl_uString_newFromAscii(&pStr,getSTR_DELIMITER() ); break; } + case PROPERTY_ID_FORMATKEY: { rtl_uString_newFromAscii(&pStr,getPROPERTY_FORMATKEY() ); break; } + case PROPERTY_ID_LOCALE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_LOCALE() ); break; } + case PROPERTY_ID_AUTOINCREMENTCREATION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_AUTOINCREMENTCREATION()); break; } + case PROPERTY_ID_PRIVILEGES: { rtl_uString_newFromAscii(&pStr,getPROPERTY_PRIVILEGES() ); break; } + case PROPERTY_ID_HAVINGCLAUSE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_HAVINGCLAUSE() ); break; } + case PROPERTY_ID_ISSIGNED: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSIGNED() ); break; } + case PROPERTY_ID_ISSEARCHABLE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ISSEARCHABLE() ); break; } + case PROPERTY_ID_LABEL: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_LABEL() ); break; } + case PROPERTY_ID_APPLYFILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_APPLYFILTER() ); break; } + case PROPERTY_ID_FILTER: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FILTER() ); break; } + case PROPERTY_ID_MASTERFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_MASTERFIELDS() ); break; } + case PROPERTY_ID_DETAILFIELDS: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_DETAILFIELDS() ); break; } + case PROPERTY_ID_FIELDTYPE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_FIELDTYPE() ); break; } + case PROPERTY_ID_VALUE: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_VALUE() ); break; } + case PROPERTY_ID_ACTIVE_CONNECTION: { rtl_uString_newFromAscii(&pStr,getPROPERTY_ID_ACTIVE_CONNECTION() ); break; } } m_aPropertyMap[_nIndex] = pStr; return pStr; diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 59abac1d1016..11cf19a82323 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.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/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index 3fd2b763554b..4122a67597dc 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.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/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx index f0ed7b0aa7b3..407f08596d66 100644 --- a/connectivity/source/commontools/warningscontainer.cxx +++ b/connectivity/source/commontools/warningscontainer.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/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index a65c7c1c99b8..0bab54ee6737 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -241,10 +241,10 @@ Reference< XConnection> OConnectionPool::createNewConnection(const ::rtl::OUStri TConnectionPool aPack; // insert the new connection and struct into the active connection map - aPack.nALiveCount = m_nALiveCount; + aPack.nALiveCount = m_nALiveCount; TActiveConnectionInfo aActiveInfo; - aActiveInfo.aPos = m_aPool.insert(TConnectionMap::value_type(nId,aPack)).first; - aActiveInfo.xPooledConnection = xPooledConnection; + aActiveInfo.aPos = m_aPool.insert(TConnectionMap::value_type(nId,aPack)).first; + aActiveInfo.xPooledConnection = xPooledConnection; m_aActiveConnections.insert(TActiveConnectionMap::value_type(xConnection,aActiveInfo)); if(m_xInvalidator->isExpired()) @@ -327,8 +327,8 @@ void OConnectionPool::calculateTimeOuts() if(m_nALiveCount < 100) nTimeOutCorrection = 20; - m_nTimeOut = m_nALiveCount / nTimeOutCorrection; - m_nALiveCount = m_nALiveCount / m_nTimeOut; + m_nTimeOut = m_nALiveCount / nTimeOutCorrection; + m_nALiveCount = m_nALiveCount / m_nTimeOut; } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index 8c3de660c8a3..0df96c3fbdb0 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -64,7 +64,7 @@ namespace connectivity //= OConnectionPool - the one-instance service for PooledConnections //= manages the active connections and the connections in the pool //========================================================================== - typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base; + typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base; // typedef for the interanl structure typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPooledConnection> > TPooledConnections; @@ -72,8 +72,8 @@ namespace connectivity // contains the currently pooled connections typedef struct { - TPooledConnections aConnections; - sal_Int32 nALiveCount; // will be decremented everytime a time says to, when will reach zero the pool will be deleted + TPooledConnections aConnections; + sal_Int32 nALiveCount; // will be decremented everytime a time says to, when will reach zero the pool will be deleted } TConnectionPool; struct TDigestHolder @@ -86,7 +86,7 @@ namespace connectivity }; - // typedef TDigestHolder + // typedef TDigestHolder struct TDigestLess : public ::std::binary_function< TDigestHolder, TDigestHolder, bool> { @@ -113,17 +113,17 @@ namespace connectivity class OConnectionPool : public OConnectionPool_Base { - TConnectionMap m_aPool; // the pooled connections - TActiveConnectionMap m_aActiveConnections; // the currently active connections - - ::osl::Mutex m_aMutex; - ::rtl::Reference<OPoolTimer> m_xInvalidator; // invalidates the conntection pool when shot - - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; // the one and only driver for this connectionpool - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDriverNode; // config node entry - ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; - sal_Int32 m_nTimeOut; - sal_Int32 m_nALiveCount; + TConnectionMap m_aPool; // the pooled connections + TActiveConnectionMap m_aActiveConnections; // the currently active connections + + ::osl::Mutex m_aMutex; + ::rtl::Reference<OPoolTimer> m_xInvalidator; // invalidates the conntection pool when shot + + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; // the one and only driver for this connectionpool + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDriverNode; // config node entry + ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; + sal_Int32 m_nTimeOut; + sal_Int32 m_nALiveCount; private: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const ::rtl::OUString& _rURL, diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx index fe3af73de4aa..f2222fee42d7 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.cxx +++ b/connectivity/source/cpool/ZConnectionWrapper.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 @@ -67,7 +67,7 @@ Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement( ) thr { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->createStatement(); } @@ -76,7 +76,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatemen { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->prepareStatement(sql); } @@ -85,7 +85,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( co { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->prepareCall(sql); } @@ -94,7 +94,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( co { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->nativeSQL(sql); } @@ -103,7 +103,7 @@ void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + m_xConnection->setAutoCommit(autoCommit); } // -------------------------------------------------------------------------------- @@ -111,7 +111,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit( ) throw(SQLException, { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->getAutoCommit(); } @@ -120,7 +120,7 @@ void SAL_CALL OConnectionWeakWrapper::commit( ) throw(SQLException, RuntimeExce { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + m_xConnection->commit(); } @@ -129,7 +129,7 @@ void SAL_CALL OConnectionWeakWrapper::rollback( ) throw(SQLException, RuntimeEx { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + m_xConnection->rollback(); } @@ -137,7 +137,7 @@ void SAL_CALL OConnectionWeakWrapper::rollback( ) throw(SQLException, RuntimeEx sal_Bool SAL_CALL OConnectionWeakWrapper::isClosed( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - + return m_xConnection->isClosed(); } // -------------------------------------------------------------------------------- @@ -145,7 +145,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->getMetaData(); } @@ -154,16 +154,16 @@ void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQL { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + m_xConnection->setReadOnly(readOnly); } // -------------------------------------------------------------------------------- sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly( ) throw(SQLException, RuntimeException) -{ +{ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->isReadOnly(); } @@ -172,7 +172,7 @@ void SAL_CALL OConnectionWeakWrapper::setCatalog( const ::rtl::OUString& catalog { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + m_xConnection->setCatalog(catalog); } @@ -181,7 +181,7 @@ void SAL_CALL OConnectionWeakWrapper::setCatalog( const ::rtl::OUString& catalog { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->getCatalog(); } @@ -190,7 +190,7 @@ void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + m_xConnection->setTransactionIsolation(level); } @@ -199,7 +199,7 @@ sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation( ) throw(SQL { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->getTransactionIsolation(); } @@ -208,7 +208,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWr { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + return m_xConnection->getTypeMap(); } @@ -217,7 +217,7 @@ void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::s { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + m_xConnection->setTypeMap(typeMap); } @@ -228,7 +228,7 @@ void SAL_CALL OConnectionWeakWrapper::close( ) throw(SQLException, RuntimeExcep { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); - + } dispose(); } @@ -236,7 +236,7 @@ void SAL_CALL OConnectionWeakWrapper::close( ) throw(SQLException, RuntimeExcep void OConnectionWeakWrapper::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - + OConnectionWeakWrapper_BASE::disposing(); OConnectionWrapper::disposing(); } diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index afc2e19aeb5f..2d2958868978 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.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 @@ -45,7 +45,7 @@ namespace connectivity typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::sdbc::XConnection > OConnectionWeakWrapper_BASE; - class OConnectionWeakWrapper : public ::comphelper::OBaseMutex + class OConnectionWeakWrapper : public ::comphelper::OBaseMutex ,public OConnectionWeakWrapper_BASE , public OConnectionWrapper { @@ -55,7 +55,7 @@ namespace connectivity virtual ~OConnectionWeakWrapper(); public: OConnectionWeakWrapper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _xConnection); - + // XServiceInfo DECLARE_SERVICE_INFO(); DECLARE_XTYPEPROVIDER() diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx index 3d577d86deb5..266002c35e94 100644 --- a/connectivity/source/cpool/ZDriverWrapper.cxx +++ b/connectivity/source/cpool/ZDriverWrapper.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 @@ -130,7 +130,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx index 1681f117f5ec..ae5e9b45f63c 100644 --- a/connectivity/source/cpool/ZDriverWrapper.hxx +++ b/connectivity/source/cpool/ZDriverWrapper.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,8 +43,8 @@ namespace connectivity //==================================================================== //= ODriverWrapper //==================================================================== - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::sdbc::XDriver - > ODriverWrapper_BASE; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::sdbc::XDriver + > ODriverWrapper_BASE; class ODriverWrapper : public ODriverWrapper_BASE { @@ -53,7 +53,7 @@ namespace connectivity m_xDriverAggregate; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; - OConnectionPool* m_pConnectionPool; + OConnectionPool* m_pConnectionPool; public: /** creates a new wrapper for a driver @@ -65,7 +65,7 @@ namespace connectivity OConnectionPool* _pPool ); - + // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); @@ -82,7 +82,7 @@ namespace connectivity }; //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // _CONNECTIVITY_CPOOL_ZDRIVERWRAPPER_HXX_ diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index f3d2e1b3fc31..73ab181d9dfe 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.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 @@ -78,7 +78,7 @@ static const ::rtl::OUString& getEnableNodeName() } //-------------------------------------------------------------------- -OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxFactory) +OPoolCollection::OPoolCollection(const Reference< XMultiServiceFactory >& _rxFactory) :m_xServiceFactory(_rxFactory) { // bootstrap all objects supporting the .sdb.Driver service @@ -205,7 +205,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const ::rtl::OUSt { Reference< XDriver > xExistentProxy; // look if we already have a proxy for this driver - for ( ConstMapDriver2DriverRefIterator aLookup = m_aDriverProxies.begin(); + for ( ConstMapDriver2DriverRefIterator aLookup = m_aDriverProxies.begin(); aLookup != m_aDriverProxies.end(); ++aLookup ) @@ -222,7 +222,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const ::rtl::OUSt xDriver = xExistentProxy; } else - { // create a new proxy for the driver + { // create a new proxy for the driver // this allows us to control the connections created by it if (m_xProxyFactory.is()) { @@ -443,8 +443,8 @@ Reference<XInterface> OPoolCollection::openNode(const ::rtl::OUString& _rPath,co { OSL_ENSURE(sal_False, ::rtl::OString("::openNode: there is no element named ") - += ::rtl::OString(_rPath.getStr(), _rPath.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("!")); + += ::rtl::OString(_rPath.getStr(), _rPath.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("!")); } catch(Exception&) { @@ -474,8 +474,8 @@ Any OPoolCollection::getNodeValue(const ::rtl::OUString& _rPath,const Reference< OSL_UNUSED( e ); // make compiler happy OSL_ENSURE(sal_False, ::rtl::OString("::getNodeValue: caught a NoSuchElementException while trying to open ") - += ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("!")); + += ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("!")); } return aReturn; } @@ -535,7 +535,7 @@ void SAL_CALL OPoolCollection::propertyChange( const ::com::sun::star::beans::Pr aIter->second->release(); } m_aPools.clear(); - m_aPools = OConnectionPools(); + m_aPools = OConnectionPools(); } } else if(evt.Source.is()) @@ -549,7 +549,7 @@ void SAL_CALL OPoolCollection::propertyChange( const ::com::sun::star::beans::Pr // 1nd relase the driver // look if we already have a proxy for this driver MapDriver2DriverRefIterator aLookup = m_aDriverProxies.begin(); - while( aLookup != m_aDriverProxies.end()) + while( aLookup != m_aDriverProxies.end()) { MapDriver2DriverRefIterator aFind = aLookup; Reference<XServiceInfo> xInfo(aLookup->first,UNO_QUERY); diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index ec318a530fd6..81ccb18ff2fd 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.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,20 +51,20 @@ namespace connectivity //= OPoolCollection - the one-instance service for PooledConnections //= manages the active connections and the connections in the pool //========================================================================== - typedef ::cppu::WeakImplHelper5< ::com::sun::star::sdbc::XDriverManager, + typedef ::cppu::WeakImplHelper5< ::com::sun::star::sdbc::XDriverManager, ::com::sun::star::sdbc::XDriverAccess, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XTerminateListener, ::com::sun::star::beans::XPropertyChangeListener - > OPoolCollection_Base; + > OPoolCollection_Base; /// OPoolCollection: controll the whole connection pooling for oo class OPoolCollection : public OPoolCollection_Base { - + //========================================================================== - typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver > ODriverCompare; - DECLARE_STL_USTRINGACCESS_MAP(OConnectionPool*, OConnectionPools); + typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver > ODriverCompare; + DECLARE_STL_USTRINGACCESS_MAP(OConnectionPool*, OConnectionPools); DECLARE_STL_MAP( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >, @@ -72,49 +72,49 @@ namespace connectivity ODriverCompare, MapDriver2DriverRef ); - MapDriver2DriverRef m_aDriverProxies; - ::osl::Mutex m_aMutex; - OConnectionPools m_aPools; // the driver pools - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriverManager > m_xManager; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriverAccess > m_xDriverAccess; - ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xConfigNode; // config node for generel connection pooling - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> m_xDesktop; + MapDriver2DriverRef m_aDriverProxies; + ::osl::Mutex m_aMutex; + OConnectionPools m_aPools; // the driver pools + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriverManager > m_xManager; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriverAccess > m_xDriverAccess; + ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xConfigNode; // config node for generel connection pooling + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> m_xDesktop; private: - OPoolCollection(); // never implemented - OPoolCollection(const OPoolCollection&); // never implemented - int operator= (const OPoolCollection&); // never implemented + OPoolCollection(); // never implemented + OPoolCollection(const OPoolCollection&); // never implemented + int operator= (const OPoolCollection&); // never implemented OPoolCollection( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); // some configuration helper methods ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithServiceFactory(const ::rtl::OUString& _rPath) const; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getConfigPoolRoot(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, const ::rtl::OUString& _rPath) const; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const ::rtl::OUString& _rPath, + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const ::rtl::OUString& _rPath, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xTreeNode) const throw(); sal_Bool isPoolingEnabled(); sal_Bool isDriverPoolingEnabled(const ::rtl::OUString& _sDriverImplName, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); - sal_Bool isPoolingEnabledByUrl( const ::rtl::OUString& _sUrl, + sal_Bool isPoolingEnabledByUrl( const ::rtl::OUString& _sUrl, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _rxDriver, ::rtl::OUString& _rsImplName, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); - OConnectionPool* getConnectionPool( const ::rtl::OUString& _sImplName, + OConnectionPool* getConnectionPool( const ::rtl::OUString& _sImplName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _xDriver, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); void clearConnectionPools(sal_Bool _bDispose); void clearDesktop(); protected: virtual ~OPoolCollection(); - public: + public: - static ::com::sun::star::uno::Any getNodeValue( const ::rtl::OUString& _rPath, + static ::com::sun::star::uno::Any getNodeValue( const ::rtl::OUString& _rPath, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xTreeNode)throw(); // XDriverManager diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index 67cdace1a525..c6344c04bb11 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.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 @@ -70,7 +70,7 @@ void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ ) thro m_xComponent.clear(); } // ----------------------------------------------------------------------------- -//XPooledConnection +//XPooledConnection Reference< XConnection > OPooledConnection::getConnection() throw(SQLException, RuntimeException) { if(!m_xComponent.is() && m_xRealConnection.is()) diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx index ccfffa870b9a..17104ae92c16 100644 --- a/connectivity/source/cpool/ZPooledConnection.hxx +++ b/connectivity/source/cpool/ZPooledConnection.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,18 +38,18 @@ namespace connectivity { //========================================================================== - //= OPooledConnection - + //= OPooledConnection - //= allows to pool a real connection //========================================================================== - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XPooledConnection - ,::com::sun::star::lang::XEventListener> OPooledConnection_Base; + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XPooledConnection + ,::com::sun::star::lang::XEventListener> OPooledConnection_Base; class OPooledConnection : public ::comphelper::OBaseMutex ,public OPooledConnection_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xRealConnection; // the connection fom driver - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent; // the connection which wraps the real connection - ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xRealConnection; // the connection fom driver + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent; // the connection which wraps the real connection + ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; public: // OComponentHelper virtual void SAL_CALL disposing(void); @@ -57,7 +57,7 @@ namespace connectivity OPooledConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory); - //XPooledConnection + //XPooledConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XEventListener diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index c1ebcd213031..d559d577e3b3 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.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 @@ -104,7 +104,7 @@ void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star return pRet; } -} // extern "C" +} // extern "C" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/dbpool.xml b/connectivity/source/cpool/dbpool.xml index 271423222641..4916954bbb25 100644 --- a/connectivity/source/cpool/dbpool.xml +++ b/connectivity/source/cpool/dbpool.xml @@ -12,7 +12,7 @@ <language>c++</language> <status value="final"/> <supported-service>com.sun.star.sdbc.ConnectionPool</supported-service> - </component-description> + </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>sal</project-build-dependency> diff --git a/connectivity/source/drivers/adabas/BCatalog.cxx b/connectivity/source/drivers/adabas/BCatalog.cxx index 13ce824e00ec..201c55c8ed61 100644 --- a/connectivity/source/drivers/adabas/BCatalog.cxx +++ b/connectivity/source/drivers/adabas/BCatalog.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 @@ -62,7 +62,7 @@ OAdabasCatalog::OAdabasCatalog(SQLHANDLE _aConnectionHdl, OAdabasConnection* _pC if ( sName.getLength() ) sName += OAdabasCatalog::getDot(); sName += _xRow->getString(3); - + return sName; } @@ -150,20 +150,20 @@ void OAdabasCatalog::correctColumnProperties(sal_Int32 /*_nPrec*/, sal_Int32& _r } break; case DataType::FLOAT: - // if(_nPrec >= 16) + // if(_nPrec >= 16) { static const ::rtl::OUString sDouble(RTL_CONSTASCII_USTRINGPARAM("DOUBLE PRECISION")); _rsTypeName = sDouble; _rnType = DataType::DOUBLE; } -// else if(_nPrec > 15) -// { -// static const ::rtl::OUString sReal = ::rtl::OUString::createFromAscii("REAL"); -// _rsTypeName = sReal; -// _rnType = DataType::REAL; -// } +// else if(_nPrec > 15) +// { +// static const ::rtl::OUString sReal = ::rtl::OUString::createFromAscii("REAL"); +// _rsTypeName = sReal; +// _rnType = DataType::REAL; +// } break; - } + } } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx index 6fa88353d593..75fc65208f87 100644 --- a/connectivity/source/drivers/adabas/BColumns.cxx +++ b/connectivity/source/drivers/adabas/BColumns.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 @@ -50,7 +50,7 @@ using namespace connectivity::sdbcx; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -69,9 +69,9 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) { if(xRow->getString(4) == _rName) { - sal_Int32 nType = xRow->getInt(5); - ::rtl::OUString sTypeName = xRow->getString(6); - sal_Int32 nPrec = xRow->getInt(7); + sal_Int32 nType = xRow->getInt(5); + ::rtl::OUString sTypeName = xRow->getString(6); + sal_Int32 nPrec = xRow->getInt(7); OAdabasCatalog::correctColumnProperties(nPrec,nType,sTypeName); sal_Bool bAutoIncrement = sal_False; if ( !_rName.equalsAscii("DEFAULT") && !m_pTable->getSchema().equalsAscii("DOMAIN") && !m_pTable->getTableName().equalsAscii("COLUMNS") ) @@ -131,7 +131,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, cons return cloneDescriptor( descriptor ); ::rtl::OUString aSql(RTL_CONSTASCII_USTRINGPARAM("ALTER TABLE ")); - ::rtl::OUString sQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString sQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); m_pTable->beginTransAction(); @@ -143,7 +143,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, cons aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); aSql += OTables::getColumnSqlType(descriptor); aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" )")); - + Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(); xStmt->execute(aSql); ::comphelper::disposeComponent(xStmt); @@ -167,7 +167,7 @@ void OColumns::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementNam if(!m_pTable->isNew()) { ::rtl::OUString aSql(RTL_CONSTASCII_USTRINGPARAM("ALTER TABLE ")); - ::rtl::OUString sQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString sQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); aSql += ::dbtools::quoteName(sQuote,m_pTable->getSchema()) + sDot + ::dbtools::quoteName(sQuote,m_pTable->getTableName()); diff --git a/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx index a594083f6e75..d0d76dbf548d 100644 --- a/connectivity/source/drivers/adabas/BConnection.cxx +++ b/connectivity/source/drivers/adabas/BConnection.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 @@ -55,7 +55,7 @@ using namespace ::com::sun::star::lang; //------------------------------------------------------------------------------ -namespace starlang = ::com::sun::star::lang; +namespace starlang = ::com::sun::star::lang; // -------------------------------------------------------------------------------- OAdabasConnection::OAdabasConnection(const SQLHANDLE _pDriverHandle, connectivity::odbc::ODBCDriver* _pDriver) : OConnection_BASE2(_pDriverHandle,_pDriver) @@ -76,8 +76,8 @@ SQLRETURN OAdabasConnection::Construct( const ::rtl::OUString& url,const Sequenc if(m_aConnectionHandle == SQL_NULL_HANDLE) throw SQLException(); - const PropertyValue *pBegin = info.getConstArray(); - const PropertyValue *pEnd = pBegin + info.getLength(); + const PropertyValue *pBegin = info.getConstArray(); + const PropertyValue *pEnd = pBegin + info.getLength(); ::rtl::OUString sHostName; sal_Int32 nLen = url.indexOf(':'); diff --git a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx index ffb76b1a62d2..115d5f0144bf 100644 --- a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx +++ b/connectivity/source/drivers/adabas/BDatabaseMetaData.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 @@ -35,7 +35,7 @@ using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -49,7 +49,7 @@ using namespace ::com::sun::star::lang; // ----------------------------------------------------------------------------- sal_Bool SAL_CALL OAdabasDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) { - return sal_True; + return sal_True; } // ----------------------------------------------------------------------------- Reference< XResultSet > OAdabasDatabaseMetaData::impl_getTypeInfo_throw( ) @@ -61,64 +61,64 @@ Reference< XResultSet > OAdabasDatabaseMetaData::impl_getTypeInfo_throw( ) { aRows.reserve(19); Reference< XResultSet > xRes = OAdabasDatabaseMetaData_BASE::impl_getTypeInfo_throw(); - + if(xRes.is()) { ::connectivity::ODatabaseMetaDataResultSet::ORow aRow(19); - + Reference< XRow> xRow(xRes,UNO_QUERY); while(xRes->next()) { sal_Int32 nPos = 1; - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (1)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (1)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (2)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (2)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (3)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (3)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (4)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (4)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (5)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (5)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (6)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (6)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (7)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (7)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getBoolean (8)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getBoolean (8)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getShort (9)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getShort (9)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getBoolean (10)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getBoolean (10)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (11)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (11)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getBoolean (12)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getBoolean (12)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (13)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getString (13)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getShort (14)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getShort (14)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getShort (15)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getShort (15)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (16)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (16)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); - aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (17)); + aRow[nPos++] = new ::connectivity::ORowSetValueDecorator(xRow->getInt (17)); if(xRow->wasNull()) aRow[nPos-1]->setNull(); aRow[nPos++] = new ::connectivity::ORowSetValueDecorator((sal_Int16)xRow->getInt(18)); @@ -131,11 +131,11 @@ Reference< XResultSet > OAdabasDatabaseMetaData::impl_getTypeInfo_throw( ) switch((sal_Int32)aRow[2]->getValue()) { case DataType::FLOAT: -// aRow[3] = sal_Int32(15); -// break; +// aRow[3] = sal_Int32(15); +// break; case DataType::REAL: -// aRow[3] = sal_Int32(16); -// break; +// aRow[3] = sal_Int32(16); +// break; case DataType::DOUBLE: aRow[2]->setValue(DataType::DOUBLE); aRow[3]->setValue(sal_Int32(18)); diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx index 8c702e1793b0..53268cbfc79d 100644 --- a/connectivity/source/drivers/adabas/BDriver.cxx +++ b/connectivity/source/drivers/adabas/BDriver.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 @@ -57,14 +57,14 @@ const char sNewLine = '\012'; #else const char sNewLine[] = "\015\012"; // \015\012 and not \n #endif -#define ADABAS_DB_11 "11.02.00" -#define ADABAS_KERNEL_11 "11.02" -#define ADABAS_DB_12 "12.01.00" -#define ADABAS_KERNEL_12 "12.01" -#define CURRENT_DB_VERSION "13.01.00" -#define CURRENT_KERNEL_VERSION "13.01" - -#define OPROCESS_ADABAS (osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH) +#define ADABAS_DB_11 "11.02.00" +#define ADABAS_KERNEL_11 "11.02" +#define ADABAS_DB_12 "12.01.00" +#define ADABAS_KERNEL_12 "12.01" +#define CURRENT_DB_VERSION "13.01.00" +#define CURRENT_KERNEL_VERSION "13.01" + +#define OPROCESS_ADABAS (osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH) #define OPROCESS_ADABAS_DBG (osl_Process_WAIT | osl_Process_SEARCHPATH) @@ -884,7 +884,7 @@ void ODriver::clearDatabase(const ::rtl::OUString& sDBName) const sal_uInt32 nArgsCount = 2; rtl_uString *pArgs[nArgsCount] = { sDBName.pData, sStop.pData }; #else - sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_clear")); + sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_clear")); const sal_uInt32 nArgsCount = 1; rtl_uString* pArgs[nArgsCount] = { sDBName.pData }; #endif @@ -936,16 +936,16 @@ void ODriver::createDb( const TDatabaseStruct& _aInfo) X_START(_aInfo.sDBName); - // SHOW_STATE() - // %m_sDbRoot%\bin\xutil -d %_aInfo.sDBName% -u %CONUSR%,%CONPWD% -b %INITCMD% + // SHOW_STATE() + // %m_sDbRoot%\bin\xutil -d %_aInfo.sDBName% -u %CONUSR%,%CONPWD% -b %INITCMD% ::rtl::OUString aBatch2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-b ")); -// if(!bBsp && INITCMD.Len() >= 40) -// { -// DirEntry aTmp(INITCMD); -// aTmp.CopyTo(aInitFile, FSYS_ACTION_COPYFILE); -// INITCMD = aInitFile.GetFull(); -// } +// if(!bBsp && INITCMD.Len() >= 40) +// { +// DirEntry aTmp(INITCMD); +// aTmp.CopyTo(aInitFile, FSYS_ACTION_COPYFILE); +// INITCMD = aInitFile.GetFull(); +// } // generate the init file for the database String sInitFile = getDatabaseInitFile(_aInfo); @@ -969,7 +969,7 @@ void ODriver::createDb( const TDatabaseStruct& _aInfo) aInitFile.EnableKillingFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(aInitFile.GetURL(),STREAM_WRITE) ); - (*pFileStream) << "ALTER USER \"" + (*pFileStream) << "ALTER USER \"" << ::rtl::OString(_aInfo.sSysUser,_aInfo.sSysUser.getLength(),gsl_getSystemTextEncoding()) << "\" NOT EXCLUSIVE " << sNewLine; @@ -990,12 +990,12 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME, const ::rtl::OUString& _PWD, const ::rtl::OUString& _CMD) { - // %XPARAM% -u %CONUSR%,%CONPWD% BINIT + // %XPARAM% -u %CONUSR%,%CONPWD% BINIT ::rtl::OUString sCommandFile = generateInitFile(); { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); - (*pFileStream) << "x_param" + (*pFileStream) << "x_param" #if defined(WIN) || defined(WNT) << ".exe" #endif @@ -1138,11 +1138,11 @@ int ODriver::X_START(const ::rtl::OUString& sDBName) const sal_uInt32 nArgsCount = 4; rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg3.pData, sArg4.pData }; - sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("strt.exe")); + sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("strt.exe")); #else const sal_uInt32 nArgsCount = 1; rtl_uString* pArgs[nArgsCount] = { sDBName.pData }; - sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_start")); + sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("x_start")); #endif oslProcess aApp; @@ -1181,7 +1181,7 @@ int ODriver::X_STOP(const ::rtl::OUString& sDBName) const sal_uInt32 nArgsCount = 3; rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg2.pData }; - sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stp.exe")); + sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stp.exe")); #else const sal_uInt32 nArgsCount = 1; rtl_uString* pArgs[nArgsCount] = { sDBName.pData }; @@ -1224,7 +1224,7 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam, { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); - (*pFileStream) << + (*pFileStream) << #if defined(WIN) || defined(WNT) "xutil.exe" #else @@ -1282,7 +1282,7 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName, { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); - (*pFileStream) << "xload" + (*pFileStream) << "xload" #if defined(WIN) || defined(WNT) << ".exe" #endif @@ -1292,13 +1292,13 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName, << ::rtl::OString(_rUSR,_rUSR.getLength(),gsl_getSystemTextEncoding()) << "," << ::rtl::OString(_rPWD,_rPWD.getLength(),gsl_getSystemTextEncoding()); - + if ( !isKernelVersion(CURRENT_DB_VERSION) ) (*pFileStream) << " -S adabas -b "; else (*pFileStream) << " -S NATIVE -b "; - (*pFileStream) << ::rtl::OString(_rBatch,_rBatch.getLength(),gsl_getSystemTextEncoding()) + (*pFileStream) << ::rtl::OString(_rBatch,_rBatch.getLength(),gsl_getSystemTextEncoding()) << " > " << ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding()) << " 2>&1" @@ -1373,7 +1373,7 @@ void ODriver::fillEnvironmentVariables() #if !(defined(WIN) || defined(WNT)) SvStream* pFileStream = aCmdFile.GetStream(STREAM_WRITE); - (*pFileStream) << "#!/bin/sh" + (*pFileStream) << "#!/bin/sh" << sNewLine << "cd \"$DBWORK\"" << sNewLine @@ -1480,7 +1480,7 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); - (*pFileStream) << "x_cons" + (*pFileStream) << "x_cons" #if defined(WIN) || defined(WNT) << ".exe" #endif @@ -1527,7 +1527,7 @@ void ODriver::checkAndRestart(const ::rtl::OUString& sDBName,const TDatabaseStru if(bRead) { if(sStateLine.Search("WARM") != STRING_NOTFOUND) - { // nothing to do + { // nothing to do nStart = 0; break; } @@ -1567,7 +1567,7 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); - (*pFileStream) << "getparam" + (*pFileStream) << "getparam" #if defined(WIN) || defined(WNT) << ".exe" #endif @@ -1607,7 +1607,7 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName, const TDatabaseStruct& _rDBInfo) { - // %DBROOT%\pgm\getparam %2 DATA_CACHE_PAGES > %3 + // %DBROOT%\pgm\getparam %2 DATA_CACHE_PAGES > %3 String sWorkUrl(m_sDbWorkURL); String sExt = String::CreateFromAscii(".st"); ::utl::TempFile aCmdFile(String::CreateFromAscii("DevSpaces"),&sExt,&sWorkUrl); @@ -1621,7 +1621,7 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName, ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); - (*pFileStream) << "getparam" + (*pFileStream) << "getparam" #if defined(WIN) || defined(WNT) << ".exe" #endif @@ -1674,7 +1674,7 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion) ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); - (*pFileStream) << "dbversion" + (*pFileStream) << "dbversion" << " > " << ::rtl::OString(sPhysicalPath.GetBuffer(),sPhysicalPath.Len(),gsl_getSystemTextEncoding()) << sNewLine; @@ -1706,12 +1706,12 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion) return bIsVersion; } // ----------------------------------------------------------------------------- -void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) +void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) { #if defined(WIN) || defined(WNT) - // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% -b %m_sDbRoot%\env\TERMCHAR.ind + // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% -b %m_sDbRoot%\env\TERMCHAR.ind ::rtl::OUString aBatch = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-b ")); - ::rtl::OUString sTemp2 = m_sDbRootURL + m_sDelimit + ::rtl::OUString sTemp2 = m_sDbRootURL + m_sDelimit + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")) + m_sDelimit + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TERMCHAR.ind")); @@ -1721,11 +1721,11 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) XUTIL(aBatch,_aInfo.sDBName,_aInfo.sControlUser,_aInfo.sControlPassword); - // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% DIAGNOSE TRIGGER OFF + // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% DIAGNOSE TRIGGER OFF XUTIL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DIAGNOSE TRIGGER OFF")),_aInfo.sDBName,_aInfo.sControlUser,_aInfo.sControlPassword); - // xload -d %_DBNAME% -u %_SYSDBA_USER%,%_SYSDBA_PWD% -S NATIVE -b %m_sDbRoot%\env\DBS.ins %_DOMAINPWD% + // xload -d %_DBNAME% -u %_SYSDBA_USER%,%_SYSDBA_PWD% -S NATIVE -b %m_sDbRoot%\env\DBS.ins %_DOMAINPWD% { - sTemp2 = m_sDbRootURL + sTemp2 = m_sDbRootURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")) + m_sDelimit + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBS.ins")); @@ -1737,9 +1737,9 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) LoadBatch(_aInfo.sDBName,_aInfo.sSysUser,_aInfo.sSysPassword,sTemp); } - // xload -d %_DBNAME% -u DOMAIN,%_DOMAINPWD% -S NATIVE -b %m_sDbRoot%\env\XDD.ins + // xload -d %_DBNAME% -u DOMAIN,%_DOMAINPWD% -S NATIVE -b %m_sDbRoot%\env\XDD.ins { - sTemp2 = m_sDbRootURL + sTemp2 = m_sDbRootURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")) + m_sDelimit + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("XDD.ins")); @@ -1749,9 +1749,9 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) LoadBatch(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAIN")),_aInfo.sDomainPassword,sTemp); } - // xload -d %_DBNAME% -u %_SYSDBA_USER%,%_SYSDBA_PWD% -S NATIVE -b %m_sDbRoot%\env\QP.ins + // xload -d %_DBNAME% -u %_SYSDBA_USER%,%_SYSDBA_PWD% -S NATIVE -b %m_sDbRoot%\env\QP.ins { - sTemp2 = m_sDbRootURL + sTemp2 = m_sDbRootURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")) + m_sDelimit + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("QP.ins")); @@ -1760,9 +1760,9 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) OSL_ENSURE(bOk,"File could be converted into file system path!"); LoadBatch(_aInfo.sDBName,_aInfo.sSysUser,_aInfo.sSysPassword,sTemp); } - // xload -d %_DBNAME% -u DOMAIN,%_DOMAINPWD% -S NATIVE -b %m_sDbRoot%\env\SPROC.ins + // xload -d %_DBNAME% -u DOMAIN,%_DOMAINPWD% -S NATIVE -b %m_sDbRoot%\env\SPROC.ins { - sTemp2 = m_sDbRootURL + sTemp2 = m_sDbRootURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")) + m_sDelimit + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SPROC.ins")); @@ -1773,13 +1773,13 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) LoadBatch(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAIN")),_aInfo.sDomainPassword,sTemp); } - // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% DIAGNOSE TRIGGER ON + // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% DIAGNOSE TRIGGER ON XUTIL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DIAGNOSE TRIGGER ON")),_aInfo.sDBName,_aInfo.sControlUser,_aInfo.sControlPassword); - // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% SET NOLOG OFF + // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% SET NOLOG OFF XUTIL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET NOLOG OFF")),_aInfo.sDBName,_aInfo.sControlUser,_aInfo.sControlPassword); - // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% SHUTDOWN QUICK + // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% SHUTDOWN QUICK XUTIL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SHUTDOWN QUICK")),_aInfo.sDBName,_aInfo.sControlUser,_aInfo.sControlPassword); - // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% RESTART + // xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% RESTART XUTIL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RESTART")),_aInfo.sDBName,_aInfo.sControlUser,_aInfo.sControlPassword); #else // UNX @@ -1787,7 +1787,7 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) { ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE)); pFileStream->Seek(STREAM_SEEK_TO_END); - (*pFileStream) << "x_dbinst" + (*pFileStream) << "x_dbinst" << " -d " << ::rtl::OString(_aInfo.sDBName,_aInfo.sDBName.getLength(),gsl_getSystemTextEncoding()) << " -u " @@ -1800,7 +1800,7 @@ void ODriver::installSystemTables( const TDatabaseStruct& _aInfo) if ( isKernelVersion(ADABAS_KERNEL_11) ) (*pFileStream) << "-i all"; - (*pFileStream) + (*pFileStream) #if (OSL_DEBUG_LEVEL > 1) || defined(DBG_UTIL) << " >> /tmp/kstart.log" #else @@ -1829,8 +1829,8 @@ void ODriver::convertOldVersion(const ::rtl::OUString& sDBName,const TDatabaseSt // first we have to check if this databse is a old version and we have to update the system tables if ( !isVersion(sDBName,CURRENT_DB_VERSION) && isKernelVersion(CURRENT_DB_VERSION) ) { - if ( !_rDbInfo.sControlUser.getLength() - || !_rDbInfo.sControlPassword.getLength()) + if ( !_rDbInfo.sControlUser.getLength() + || !_rDbInfo.sControlPassword.getLength()) { ::connectivity::SharedResources aResources; const ::rtl::OUString sError( aResources.getResourceString(STR_DATABASE_NEEDS_CONVERTING) ); @@ -1860,7 +1860,7 @@ void ODriver::convertOldVersion(const ::rtl::OUString& sDBName,const TDatabaseSt } } } - + UCBContentHelper::Kill(sCommandFile); } } diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx index ee6159aae64c..0bdb2585ab86 100644 --- a/connectivity/source/drivers/adabas/BFunctions.cxx +++ b/connectivity/source/drivers/adabas/BFunctions.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 @@ -44,7 +44,7 @@ T3SQLConnect pODBC3SQLConnect; T3SQLDriverConnect pODBC3SQLDriverConnect; T3SQLBrowseConnect pODBC3SQLBrowseConnect; T3SQLDataSources pODBC3SQLDataSources; -T3SQLDrivers pODBC3SQLDrivers; +T3SQLDrivers pODBC3SQLDrivers; T3SQLGetInfo pODBC3SQLGetInfo; T3SQLGetFunctions pODBC3SQLGetFunctions; T3SQLGetTypeInfo pODBC3SQLGetTypeInfo; @@ -88,7 +88,7 @@ T3SQLForeignKeys pODBC3SQLForeignKeys; T3SQLPrimaryKeys pODBC3SQLPrimaryKeys; T3SQLProcedureColumns pODBC3SQLProcedureColumns; T3SQLProcedures pODBC3SQLProcedures; -T3SQLSpecialColumns pODBC3SQLSpecialColumns; +T3SQLSpecialColumns pODBC3SQLSpecialColumns; T3SQLStatistics pODBC3SQLStatistics; T3SQLTablePrivileges pODBC3SQLTablePrivileges; T3SQLTables pODBC3SQLTables; @@ -116,14 +116,14 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath) ::rtl::OUString sTemp(RTL_CONSTASCII_USTRINGPARAM("DBROOT")); if ( osl_getEnvironment(sTemp.pData,&pPath) == osl_Process_E_None && pPath ) { - + #if ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX) || defined(MACOSX) _rPath = ::rtl::OUString(pPath); _rPath += ::rtl::OUString::createFromAscii("/lib/"); #endif rtl_uString_release(pPath); } - else + else { _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The variable DBROOT is not set.")); return sal_False; @@ -153,119 +153,119 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath) sal_Bool LoadFunctions(oslModule pODBCso) { - if( ( pODBC3SQLAllocHandle = (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLAllocHandle").pData )) == NULL ) + if( ( pODBC3SQLAllocHandle = (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLAllocHandle").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLConnect = (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLConnect").pData )) == NULL ) + if( ( pODBC3SQLConnect = (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLConnect").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDriverConnect = (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDriverConnect").pData )) == NULL ) + if( ( pODBC3SQLDriverConnect = (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDriverConnect").pData )) == NULL ) return sal_False; if( ( pODBC3SQLBrowseConnect = (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBrowseConnect").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetInfo = (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetInfo").pData )) == NULL ) + if( ( pODBC3SQLGetInfo = (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetInfo").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetTypeInfo = (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetTypeInfo").pData )) == NULL ) + if( ( pODBC3SQLGetTypeInfo = (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetTypeInfo").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetConnectAttr = (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetConnectAttr").pData )) == NULL ) + if( ( pODBC3SQLSetConnectAttr = (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetConnectAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetConnectAttr = (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetConnectAttr").pData )) == NULL ) + if( ( pODBC3SQLGetConnectAttr = (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetConnectAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetEnvAttr = (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetEnvAttr").pData )) == NULL ) + if( ( pODBC3SQLSetEnvAttr = (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetEnvAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetEnvAttr = (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetEnvAttr").pData )) == NULL ) + if( ( pODBC3SQLGetEnvAttr = (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetEnvAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetStmtAttr = (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetStmtAttr").pData )) == NULL ) + if( ( pODBC3SQLSetStmtAttr = (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetStmtAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetStmtAttr = (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetStmtAttr").pData )) == NULL ) + if( ( pODBC3SQLGetStmtAttr = (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetStmtAttr").pData )) == NULL ) return sal_False; - /*if( ( pODBC3SQLSetDescField = (T3SQLSetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescField").pData )) == NULL ) + /*if( ( pODBC3SQLSetDescField = (T3SQLSetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescField").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetDescField = (T3SQLGetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescField").pData )) == NULL ) + if( ( pODBC3SQLGetDescField = (T3SQLGetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescField").pData )) == NULL ) return sal_False;*/ - /*if( ( pODBC3SQLGetDescRec = (T3SQLGetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescRec").pData )) == NULL ) + /*if( ( pODBC3SQLGetDescRec = (T3SQLGetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescRec").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetDescRec = (T3SQLSetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescRec").pData )) == NULL ) + if( ( pODBC3SQLSetDescRec = (T3SQLSetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescRec").pData )) == NULL ) return sal_False;*/ - if( ( pODBC3SQLPrepare = (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrepare").pData )) == NULL ) + if( ( pODBC3SQLPrepare = (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrepare").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLBindParameter = (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindParameter").pData )) == NULL ) + if( ( pODBC3SQLBindParameter = (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindParameter").pData )) == NULL ) return sal_False; -// if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL ) -// return sal_False; - if( ( pODBC3SQLSetCursorName = (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetCursorName").pData )) == NULL ) +// if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL ) +// return sal_False; + if( ( pODBC3SQLSetCursorName = (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetCursorName").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLExecute = (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecute").pData )) == NULL ) + if( ( pODBC3SQLExecute = (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecute").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLExecDirect = (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecDirect").pData )) == NULL ) + if( ( pODBC3SQLExecDirect = (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecDirect").pData )) == NULL ) return sal_False; - /*if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL ) + /*if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL ) return sal_False;*/ if( ( pODBC3SQLDescribeParam = (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeParam").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLNumParams = (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumParams").pData )) == NULL ) + if( ( pODBC3SQLNumParams = (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumParams").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLParamData = (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLParamData").pData )) == NULL ) + if( ( pODBC3SQLParamData = (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLParamData").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLPutData = (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPutData").pData )) == NULL ) + if( ( pODBC3SQLPutData = (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPutData").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLRowCount = (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLRowCount").pData )) == NULL ) + if( ( pODBC3SQLRowCount = (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLRowCount").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLNumResultCols = (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumResultCols").pData )) == NULL ) + if( ( pODBC3SQLNumResultCols = (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumResultCols").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDescribeCol = (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeCol").pData )) == NULL ) + if( ( pODBC3SQLDescribeCol = (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeCol").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLColAttribute = (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColAttribute").pData )) == NULL ) + if( ( pODBC3SQLColAttribute = (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColAttribute").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLBindCol = (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindCol").pData )) == NULL ) + if( ( pODBC3SQLBindCol = (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindCol").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFetch = (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetch").pData )) == NULL ) + if( ( pODBC3SQLFetch = (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetch").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFetchScroll = (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetchScroll").pData )) == NULL ) + if( ( pODBC3SQLFetchScroll = (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetchScroll").pData )) == NULL ) + return sal_False; + if( ( pODBC3SQLGetData = (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetData").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetData = (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetData").pData )) == NULL ) + if( ( pODBC3SQLSetPos = (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetPos").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetPos = (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetPos").pData )) == NULL ) + if( ( pODBC3SQLMoreResults = (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLMoreResults").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLMoreResults = (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLMoreResults").pData )) == NULL ) - return sal_False; - /*if( ( pODBC3SQLGetDiagField = (T3SQLGetDiagField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagField").pData )) == NULL ) + /*if( ( pODBC3SQLGetDiagField = (T3SQLGetDiagField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagField").pData )) == NULL ) return sal_False;*/ - if( ( pODBC3SQLGetDiagRec = (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagRec").pData )) == NULL ) + if( ( pODBC3SQLGetDiagRec = (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagRec").pData )) == NULL ) return sal_False; if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumnPrivileges").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLColumns = (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumns").pData )) == NULL ) + if( ( pODBC3SQLColumns = (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumns").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLForeignKeys = (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLForeignKeys").pData )) == NULL ) + if( ( pODBC3SQLForeignKeys = (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLForeignKeys").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLPrimaryKeys = (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrimaryKeys").pData )) == NULL ) + if( ( pODBC3SQLPrimaryKeys = (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrimaryKeys").pData )) == NULL ) return sal_False; if( ( pODBC3SQLProcedureColumns = (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedureColumns").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLProcedures = (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedures").pData )) == NULL ) + if( ( pODBC3SQLProcedures = (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedures").pData )) == NULL ) return sal_False; if( ( pODBC3SQLSpecialColumns = (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSpecialColumns").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLStatistics = (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLStatistics").pData )) == NULL ) - return sal_False; - if( ( pODBC3SQLTablePrivileges = (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTablePrivileges").pData )) == NULL ) + if( ( pODBC3SQLStatistics = (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLStatistics").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLTables = (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTables").pData )) == NULL ) + if( ( pODBC3SQLTablePrivileges = (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTablePrivileges").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFreeStmt = (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeStmt").pData )) == NULL ) + if( ( pODBC3SQLTables = (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTables").pData )) == NULL ) + return sal_False; + if( ( pODBC3SQLFreeStmt = (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeStmt").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLCloseCursor = (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCloseCursor").pData )) == NULL ) + if( ( pODBC3SQLCloseCursor = (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCloseCursor").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLCancel = (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCancel").pData )) == NULL ) + if( ( pODBC3SQLCancel = (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCancel").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLEndTran = (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLEndTran").pData )) == NULL ) + if( ( pODBC3SQLEndTran = (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLEndTran").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDisconnect = (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDisconnect").pData )) == NULL ) + if( ( pODBC3SQLDisconnect = (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDisconnect").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFreeHandle = (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeHandle").pData )) == NULL ) + if( ( pODBC3SQLFreeHandle = (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeHandle").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL ) + if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL ) + if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL ) return sal_False; return sal_True; diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx index 2669454192e1..0f488b635729 100644 --- a/connectivity/source/drivers/adabas/BGroup.cxx +++ b/connectivity/source/drivers/adabas/BGroup.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 @@ -39,13 +39,13 @@ using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OAdabasGroup::OAdabasGroup( OAdabasConnection* _pConnection) : connectivity::sdbcx::OGroup(sal_True) +OAdabasGroup::OAdabasGroup( OAdabasConnection* _pConnection) : connectivity::sdbcx::OGroup(sal_True) ,m_pConnection(_pConnection) { construct(); diff --git a/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx index f514b9eef8bb..acc6751521f9 100644 --- a/connectivity/source/drivers/adabas/BGroups.cxx +++ b/connectivity/source/drivers/adabas/BGroups.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 @@ -40,7 +40,7 @@ using namespace connectivity; using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -58,15 +58,15 @@ void OGroups::impl_refresh() throw(RuntimeException) // ------------------------------------------------------------------------- Reference< XPropertySet > OGroups::createDescriptor() { - // OAdabasGroup* pNew = + // OAdabasGroup* pNew = return new OAdabasGroup(m_pConnection); } // ------------------------------------------------------------------------- // XAppend sdbcx::ObjectType OGroups::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& /*descriptor*/ ) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE USERGROUP "); - ::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE USERGROUP "); + ::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( ); aSql = aSql + aQuote + _rForName + aQuote; @@ -80,8 +80,8 @@ sdbcx::ObjectType OGroups::appendObject( const ::rtl::OUString& _rForName, const // XDrop void OGroups::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP USERGROUP "); - ::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP USERGROUP "); + ::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( ); aSql = aSql + aQuote + _sElementName + aQuote; diff --git a/connectivity/source/drivers/adabas/BIndex.cxx b/connectivity/source/drivers/adabas/BIndex.cxx index 876d0a7fe03f..f8f574783e1f 100644 --- a/connectivity/source/drivers/adabas/BIndex.cxx +++ b/connectivity/source/drivers/adabas/BIndex.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 @@ -38,12 +38,12 @@ using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OAdabasIndex::OAdabasIndex( OAdabasTable* _pTable, +OAdabasIndex::OAdabasIndex( OAdabasTable* _pTable, const ::rtl::OUString& _Name, const ::rtl::OUString& _Catalog, sal_Bool _isUnique, @@ -60,8 +60,8 @@ OAdabasIndex::OAdabasIndex( OAdabasTable* _pTable, refreshColumns(); } // ------------------------------------------------------------------------- -OAdabasIndex::OAdabasIndex(OAdabasTable* _pTable) - : connectivity::sdbcx::OIndex(sal_True) +OAdabasIndex::OAdabasIndex(OAdabasTable* _pTable) + : connectivity::sdbcx::OIndex(sal_True) ,m_pTable(_pTable) { construct(); @@ -98,7 +98,7 @@ void OAdabasIndex::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new OIndexColumns(this,m_aMutex,aVector); + m_pColumns = new OIndexColumns(this,m_aMutex,aVector); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx index 5cc13d78f4f7..2ca68733d27b 100644 --- a/connectivity/source/drivers/adabas/BIndexColumns.cxx +++ b/connectivity/source/drivers/adabas/BIndexColumns.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 @@ -44,7 +44,7 @@ using namespace connectivity::adabas; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -79,9 +79,9 @@ ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName) { if(xRow->getString(4) == _rName) { - sal_Int32 nType = xRow->getInt(5); - ::rtl::OUString sTypeName = xRow->getString(6); - sal_Int32 nPrec = xRow->getInt(7); + sal_Int32 nType = xRow->getInt(5); + ::rtl::OUString sTypeName = xRow->getString(6); + sal_Int32 nPrec = xRow->getInt(7); OAdabasCatalog::correctColumnProperties(nPrec,nType,sTypeName); OIndexColumn* pRet = new OIndexColumn(bAsc, diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx index 0da65ae53257..19bd0b80c46c 100644 --- a/connectivity/source/drivers/adabas/BIndexes.cxx +++ b/connectivity/source/drivers/adabas/BIndexes.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 @@ -58,12 +58,12 @@ sdbcx::ObjectType OIndexes::createObject(const ::rtl::OUString& _rName) sal_Int32 nLen = _rName.indexOf('.'); if(nLen != -1) { - aQualifier = _rName.copy(0,nLen); - aName = _rName.copy(nLen+1); + aQualifier = _rName.copy(0,nLen); + aName = _rName.copy(nLen+1); } else - aName = _rName; - + aName = _rName; + Reference< XResultSet > xResult = m_pTable->getMetaData()->getIndexInfo(Any(), m_pTable->getSchema(),m_pTable->getTableName(),sal_False,sal_False); @@ -72,7 +72,7 @@ sdbcx::ObjectType OIndexes::createObject(const ::rtl::OUString& _rName) if(xResult.is()) { Reference< XRow > xRow(xResult,UNO_QUERY); - while(xResult->next()) + while(xResult->next()) { if(xRow->getString(6) == aName && (!aQualifier.getLength() || xRow->getString(5) == aQualifier )) { @@ -105,15 +105,15 @@ sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, cons if ( m_pTable->isNew() ) ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(this)); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE "); - ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE "); + ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); if(getBOOL(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE)))) aSql = aSql + ::rtl::OUString::createFromAscii("UNIQUE "); aSql = aSql + ::rtl::OUString::createFromAscii("INDEX "); - + if(_rForName.getLength()) { aSql = aSql + aQuote + _rForName + aQuote @@ -130,12 +130,12 @@ sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, cons { xColumns->getByIndex(i) >>= xColProp; aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote; - aSql = aSql + (getBOOL(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING))) - ? + aSql = aSql + (getBOOL(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING))) + ? ::rtl::OUString::createFromAscii(" ASC") : ::rtl::OUString::createFromAscii(" DESC")) - + ::rtl::OUString::createFromAscii(","); + + ::rtl::OUString::createFromAscii(","); } aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")")); } @@ -169,10 +169,10 @@ void OIndexes::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementNam ::rtl::OUString aName,aSchema; sal_Int32 nLen = _sElementName.indexOf('.'); aSchema = _sElementName.copy(0,nLen); - aName = _sElementName.copy(nLen+1); + aName = _sElementName.copy(nLen+1); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP INDEX "); - ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP INDEX "); + ::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); if (aSchema.getLength()) diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx index 9c130d6e5690..21e4a302956d 100644 --- a/connectivity/source/drivers/adabas/BKeys.cxx +++ b/connectivity/source/drivers/adabas/BKeys.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 @@ -63,14 +63,14 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R return xNewDescriptor; } - sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); + sal_Int32 nKeyType = getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); - const ::rtl::OUString aQuote = getTable()->getConnection()->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("ALTER TABLE "); + const ::rtl::OUString aQuote = getTable()->getConnection()->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); aSql += composeTableName( getTable()->getConnection()->getMetaData(), getTable(), ::dbtools::eInTableDefinitions, false, false, true ); - + if(nKeyType == KeyType::PRIMARY) { aSql = aSql + ::rtl::OUString::createFromAscii(" ALTER PRIMARY KEY ("); @@ -84,13 +84,13 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY); Reference<XIndexAccess> xColumns(xColumnSup->getColumns(),UNO_QUERY); - + for(sal_Int32 i=0;i<xColumns->getCount();++i) { Reference< XPropertySet > xColProp; xColumns->getByIndex(i) >>= xColProp; aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote - + ::rtl::OUString::createFromAscii(","); + + ::rtl::OUString::createFromAscii(","); } aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")")); @@ -99,13 +99,13 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R if(nKeyType == KeyType::FOREIGN) { - nDeleteRule = getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE))); + nDeleteRule = getINT32(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE))); ::rtl::OUString aName,aSchema; sReferencedName = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE))); sal_Int32 nLen = sReferencedName.indexOf('.'); aSchema = sReferencedName.copy(0,nLen); - aName = sReferencedName.copy(nLen+1); + aName = sReferencedName.copy(nLen+1); aSql += ::rtl::OUString::createFromAscii(" REFERENCES ") + aQuote + aSchema + aQuote + sDot + aQuote + aName + aQuote; aSql += ::rtl::OUString::createFromAscii(" ("); @@ -115,7 +115,7 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R Reference< XPropertySet > xColProp; xColumns->getByIndex(i) >>= xColProp; aSql = aSql + aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN))) + aQuote - + ::rtl::OUString::createFromAscii(","); + + ::rtl::OUString::createFromAscii(","); } aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")")); @@ -147,8 +147,8 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString& _rForName, const R { const ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); ::rtl::OUString aSchema,aTable; - getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; - getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; + getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema; + getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) >>= aTable; Reference< XResultSet > xResult = getTable()->getMetaData()->getImportedKeys( getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) ,aSchema ,aTable); diff --git a/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/connectivity/source/drivers/adabas/BPreparedStatement.cxx index c217f660d67b..a25b760c3e4b 100644 --- a/connectivity/source/drivers/adabas/BPreparedStatement.cxx +++ b/connectivity/source/drivers/adabas/BPreparedStatement.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 @@ -46,7 +46,7 @@ using namespace com::sun::star::container; using namespace com::sun::star::io; using namespace com::sun::star::util; -OAdabasPreparedStatement::OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::rtl::OUString& sql) +OAdabasPreparedStatement::OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::rtl::OUString& sql) : ::connectivity::odbc::OPreparedStatement( _pConnection,sql) { m_aSelectColumns = _pConnection->createSelectColumns(sql); @@ -68,7 +68,7 @@ void OAdabasPreparedStatement::setResultSetConcurrency(sal_Int32 /*_par0*/) ::dbtools::throwFeatureNotImplementedException( "PreparedStatement:ResultSetConcurrency", *this ); } // ----------------------------------------------------------------------------- -void OAdabasPreparedStatement::setResultSetType(sal_Int32 /*_par0*/) +void OAdabasPreparedStatement::setResultSetType(sal_Int32 /*_par0*/) { ::dbtools::throwFeatureNotImplementedException( "PreparedStatement:ResultSetType", *this ); } diff --git a/connectivity/source/drivers/adabas/BResultSet.cxx b/connectivity/source/drivers/adabas/BResultSet.cxx index 4ce890994092..96212030c99f 100644 --- a/connectivity/source/drivers/adabas/BResultSet.cxx +++ b/connectivity/source/drivers/adabas/BResultSet.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 @@ -56,7 +56,7 @@ sal_Bool SAL_CALL OAdabasResultSet::next( ) throw(SQLException, RuntimeExceptio m_nLastColumnPos = 0; - // m_nCurrentFetchState = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_NEXT,0); + // m_nCurrentFetchState = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_NEXT,0); m_nCurrentFetchState = N3SQLFetch(m_aStatementHandle); if(m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO) @@ -192,7 +192,7 @@ void SAL_CALL OAdabasResultSet::refreshRow( ) throw(SQLException, RuntimeExcept checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - // SQLRETURN nRet = N3SQLSetPos(m_aStatementHandle,1,SQL_REFRESH,SQL_LOCK_NO_CHANGE); + // SQLRETURN nRet = N3SQLSetPos(m_aStatementHandle,1,SQL_REFRESH,SQL_LOCK_NO_CHANGE); N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_RETRIEVE_DATA,(SQLPOINTER)SQL_RD_OFF,SQL_IS_UINTEGER); m_nCurrentFetchState = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_RELATIVE,0); sal_Bool bRet = m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO; diff --git a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx index 18605f519549..fe1eba559a4d 100644 --- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx +++ b/connectivity/source/drivers/adabas/BResultSetMetaData.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 @@ -39,7 +39,7 @@ using namespace com::sun::star::uno; using namespace connectivity::adabas; using namespace connectivity; -OAdabasResultSetMetaData::OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt,const ::rtl::Reference<OSQLColumns>& _rSelectColumns ) +OAdabasResultSetMetaData::OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt,const ::rtl::Reference<OSQLColumns>& _rSelectColumns ) : OAdabasResultSetMetaData_BASE(_pConnection,_pStmt) ,m_aSelectColumns(_rSelectColumns) { diff --git a/connectivity/source/drivers/adabas/BStatement.cxx b/connectivity/source/drivers/adabas/BStatement.cxx index 6f5cf4028b90..f4e399cc3c07 100644 --- a/connectivity/source/drivers/adabas/BStatement.cxx +++ b/connectivity/source/drivers/adabas/BStatement.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 @@ -53,18 +53,18 @@ OResultSet* OAdabasStatement::createResulSet() return new OAdabasResultSet(m_aStatementHandle,this,m_aSelectColumns); } // ----------------------------------------------------------------------------- -void OAdabasStatement::setUsingBookmarks(sal_Bool /*_bUseBookmark*/) +void OAdabasStatement::setUsingBookmarks(sal_Bool /*_bUseBookmark*/) { ::dbtools::throwFeatureNotImplementedException( "bookmarks", *this ); // adabas doesn't support bookmarks } // ----------------------------------------------------------------------------- -void OAdabasStatement::setResultSetConcurrency(sal_Int32 /*_par0*/) +void OAdabasStatement::setResultSetConcurrency(sal_Int32 /*_par0*/) { ::dbtools::throwFeatureNotImplementedException( "PreparedStatement:ResultSetConcurrency", *this ); } // ----------------------------------------------------------------------------- -void OAdabasStatement::setResultSetType(sal_Int32 /*_par0*/) +void OAdabasStatement::setResultSetType(sal_Int32 /*_par0*/) { ::dbtools::throwFeatureNotImplementedException( "PreparedStatement:ResultSetType", *this ); } diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx index ad76c4a3f4b1..323f658fdf61 100644 --- a/connectivity/source/drivers/adabas/BTable.cxx +++ b/connectivity/source/drivers/adabas/BTable.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 @@ -57,7 +57,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OAdabasTable::OAdabasTable( sdbcx::OCollection* _pTables, +OAdabasTable::OAdabasTable( sdbcx::OCollection* _pTables, OAdabasConnection* _pConnection) :OTable_TYPEDEF(_pTables,_pConnection,sal_True) ,m_pConnection(_pConnection) @@ -65,14 +65,14 @@ OAdabasTable::OAdabasTable( sdbcx::OCollection* _pTables, construct(); } // ------------------------------------------------------------------------- -OAdabasTable::OAdabasTable( sdbcx::OCollection* _pTables, +OAdabasTable::OAdabasTable( sdbcx::OCollection* _pTables, OAdabasConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString& _Description , const ::rtl::OUString& _SchemaName, const ::rtl::OUString& _CatalogName - ) : OTableHelper( _pTables, + ) : OTableHelper( _pTables, _pConnection, sal_True, _Name, @@ -152,27 +152,27 @@ void SAL_CALL OAdabasTable::alterColumnByName( const ::rtl::OUString& colName, c // first check the types sal_Int32 nOldType = 0,nNewType = 0,nOldPrec = 0,nNewPrec = 0,nOldScale = 0,nNewScale = 0; - xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType; - descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType; + xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType; + descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType; // and precsions and scale - xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nOldPrec; + xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nOldPrec; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))>>= nNewPrec; - xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nOldScale; - descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nNewScale; + xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nOldScale; + descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nNewScale; if(nOldType != nNewType || nOldPrec != nNewPrec || nOldScale != nNewScale) alterColumnType(colName,descriptor); // second: check the "is nullable" value sal_Int32 nOldNullable = 0,nNewNullable = 0; - xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nOldNullable; - descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable; + xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nOldNullable; + descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable; if(nNewNullable != nOldNullable) alterNotNullValue(nNewNullable,colName); // third: check the default values ::rtl::OUString sNewDefault,sOldDefault; - xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; + xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault; if(sOldDefault.getLength()) diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx index b09476b154e8..4fb9626cc595 100644 --- a/connectivity/source/drivers/adabas/BTables.cxx +++ b/connectivity/source/drivers/adabas/BTables.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 @@ -62,12 +62,12 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) ::rtl::OUString aName,aSchema; sal_Int32 nLen = _rName.indexOf('.'); aSchema = _rName.copy(0,nLen); - aName = _rName.copy(nLen+1); + aName = _rName.copy(nLen+1); Sequence< ::rtl::OUString > aTypes(1); aTypes[0] = ::rtl::OUString::createFromAscii("%"); - // aTypes[0] = ::rtl::OUString::createFromAscii("TABLE"); - // aTypes[1] = ::rtl::OUString::createFromAscii("SYSTEMTABLE"); + // aTypes[0] = ::rtl::OUString::createFromAscii("TABLE"); + // aTypes[1] = ::rtl::OUString::createFromAscii("SYSTEMTABLE"); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); @@ -77,7 +77,7 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) Reference< XRow > xRow(xResult,UNO_QUERY); if(xResult->next()) // there can be only one table with this name { - OAdabasTable* pRet = new OAdabasTable(this, static_cast<OAdabasCatalog&>(m_rParent).getConnection(), + OAdabasTable* pRet = new OAdabasTable(this, static_cast<OAdabasCatalog&>(m_rParent).getConnection(), aName,xRow->getString(4),xRow->getString(5),aSchema); xRet = pRet; } @@ -112,8 +112,8 @@ sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString& _rForName, const // ------------------------------------------------------------------------- void OTables::setComments(const Reference< XPropertySet >& descriptor ) throw(SQLException, RuntimeException) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE TABLE "); - ::rtl::OUString aQuote = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE TABLE "); + ::rtl::OUString aQuote = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); OAdabasConnection* pConnection = static_cast<OAdabasCatalog&>(m_rParent).getConnection(); @@ -174,7 +174,7 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) ::rtl::OUString aName,aSchema; sal_Int32 nLen = _sElementName.indexOf('.'); aSchema = _sElementName.copy(0,nLen); - aName = _sElementName.copy(nLen+1); + aName = _sElementName.copy(nLen+1); ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP "); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); @@ -202,8 +202,8 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) // ------------------------------------------------------------------------- void OTables::createTable( const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE TABLE "); - ::rtl::OUString aQuote = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE TABLE "); + ::rtl::OUString aQuote = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); ::rtl::OUString sSchema; @@ -255,7 +255,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor ) if(::cppu::extractInterface(xColProp,xKeys->getByIndex(key)) && xColProp.is()) { - sal_Int32 nKeyType = getINT32(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); + sal_Int32 nKeyType = getINT32(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); if(nKeyType == KeyType::PRIMARY) { @@ -273,7 +273,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor ) { if(::cppu::extractInterface(xColProp,xColumns->getByIndex(column)) && xColProp.is()) aSql += aQuote + getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + aQuote - + ::rtl::OUString::createFromAscii(","); + + ::rtl::OUString::createFromAscii(","); } aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString::createFromAscii(")")); @@ -297,7 +297,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor ) } else if(nKeyType == KeyType::FOREIGN) { - sal_Int32 nDeleteRule = getINT32(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE))); + sal_Int32 nDeleteRule = getINT32(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE))); xColumnSup = Reference<XColumnsSupplier>(xColProp,UNO_QUERY); xColumns = Reference<XIndexAccess>(xColumnSup->getColumns(),UNO_QUERY); @@ -308,7 +308,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor ) ::rtl::OUString aName,aSchema,aRefTable = getString(xColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE))); sal_Int32 nLen = aRefTable.indexOf('.'); aSchema = aRefTable.copy(0,nLen); - aName = aRefTable.copy(nLen+1); + aName = aRefTable.copy(nLen+1); aSql += aQuote + aSchema + aQuote + sDot + aQuote + aName + aQuote @@ -443,7 +443,7 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable) // ----------------------------------------------------------------------------- ::rtl::OUString OTables::getTypeString(const Reference< XPropertySet >& _rxColProp) { - ::rtl::OUString aValue; + ::rtl::OUString aValue; switch(getINT32(_rxColProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) { case DataType::BIT: diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx index 671edf6df8fb..c6bf7287998a 100644 --- a/connectivity/source/drivers/adabas/BUser.cxx +++ b/connectivity/source/drivers/adabas/BUser.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 @@ -48,7 +48,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OAdabasUser::OAdabasUser( OAdabasConnection* _pConnection) : connectivity::sdbcx::OUser(sal_True) +OAdabasUser::OAdabasUser( OAdabasConnection* _pConnection) : connectivity::sdbcx::OUser(sal_True) ,m_pConnection(_pConnection) { construct(); @@ -90,16 +90,16 @@ void OAdabasUser::refreshGroups() m_pGroups = new OGroups(*this,m_aMutex,aVector,m_pConnection,this); } // ------------------------------------------------------------------------- -OUserExtend::OUserExtend( OAdabasConnection* _pConnection) : OAdabasUser(_pConnection) +OUserExtend::OUserExtend( OAdabasConnection* _pConnection) : OAdabasUser(_pConnection) { construct(); } // ------------------------------------------------------------------------- -typedef connectivity::sdbcx::OUser OUser_TYPEDEF; +typedef connectivity::sdbcx::OUser OUser_TYPEDEF; void OUserExtend::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } // ----------------------------------------------------------------------------- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const @@ -266,10 +266,10 @@ void SAL_CALL OAdabasUser::changePassword( const ::rtl::OUString& objPassword, c if(pNewConnection) { Sequence< PropertyValue> aSeq(2); - aSeq.getArray()[0].Name = ::rtl::OUString::createFromAscii("user") ; - aSeq.getArray()[0].Value <<= m_Name; - aSeq.getArray()[1].Name = ::rtl::OUString::createFromAscii("password") ; - aSeq.getArray()[1].Value <<= objPassword; + aSeq.getArray()[0].Name = ::rtl::OUString::createFromAscii("user") ; + aSeq.getArray()[0].Value <<= m_Name; + aSeq.getArray()[1].Name = ::rtl::OUString::createFromAscii("password") ; + aSeq.getArray()[1].Value <<= objPassword; pNewConnection->Construct(m_pConnection->getMetaData()->getURL(),aSeq); } bDisposeConnection = sal_True; diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx index c342a9158339..a0e8fc1ca07d 100644 --- a/connectivity/source/drivers/adabas/BUsers.cxx +++ b/connectivity/source/drivers/adabas/BUsers.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 @@ -44,7 +44,7 @@ using namespace connectivity; using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -69,8 +69,8 @@ Reference< XPropertySet > OUsers::createDescriptor() // XAppend sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE USER "); - ::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE USER "); + ::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sUserName( _rForName ); sUserName = sUserName.toAsciiUpperCase(); @@ -115,8 +115,8 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) } { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP USER "); - ::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP USER "); + ::rtl::OUString aQuote = m_pConnection->getMetaData()->getIdentifierQuoteString( ); aSql += ::dbtools::quoteName(aQuote,_sElementName); Reference< XStatement > xStmt = m_pConnection->createStatement( ); diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx index 75caf4fd3967..a2321c0422f9 100644 --- a/connectivity/source/drivers/adabas/BViews.cxx +++ b/connectivity/source/drivers/adabas/BViews.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 @@ -64,7 +64,7 @@ sdbcx::ObjectType OViews::createObject(const ::rtl::OUString& _rName) ::rtl::OUString aName,aSchema; sal_Int32 nLen = _rName.indexOf('.'); aSchema = _rName.copy(0,nLen); - aName = _rName.copy(nLen+1); + aName = _rName.copy(nLen+1); ::rtl::OUString sStmt = ::rtl::OUString::createFromAscii("SELECT DISTINCT * FROM DOMAIN.SHOW_VIEW WHERE "); if(aSchema.getLength()) @@ -141,7 +141,7 @@ void OViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) ::rtl::OUString aName,aSchema; sal_Int32 nLen = _sElementName.indexOf('.'); aSchema = _sElementName.copy(0,nLen); - aName = _sElementName.copy(nLen+1); + aName = _sElementName.copy(nLen+1); ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW"); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); @@ -162,8 +162,8 @@ void OViews::dropByNameImpl(const ::rtl::OUString& elementName) // ----------------------------------------------------------------------------- void OViews::createView( const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW "); - ::rtl::OUString aQuote = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW "); + ::rtl::OUString aQuote = static_cast<OAdabasCatalog&>(m_rParent).getConnection()->getMetaData()->getIdentifierQuoteString( ); const ::rtl::OUString& sDot = OAdabasCatalog::getDot(); ::rtl::OUString sSchema,sCommand; diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx index dec42a770ba8..a1f26ca24277 100644 --- a/connectivity/source/drivers/adabas/Bservices.cxx +++ b/connectivity/source/drivers/adabas/Bservices.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 @@ -116,8 +116,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/adabas/adabas.xcu b/connectivity/source/drivers/adabas/adabas.xcu index b92067235e15..fa7defad35c5 100755 --- a/connectivity/source/drivers/adabas/adabas.xcu +++ b/connectivity/source/drivers/adabas/adabas.xcu @@ -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/source/drivers/adabas/adabas.xml b/connectivity/source/drivers/adabas/adabas.xml index a3fd2b8b1371..bc6e1348bd8d 100644 --- a/connectivity/source/drivers/adabas/adabas.xml +++ b/connectivity/source/drivers/adabas/adabas.xml @@ -12,7 +12,7 @@ <language>c++</language> <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> - </component-description> + </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>sal</project-build-dependency> diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index 1d1cdabf656a..feb29ec8d9b7 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.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 @@ -41,10 +41,10 @@ using namespace com::sun::star::lang; IMPLEMENT_SERVICE_INFO(OCallableStatement,"com.sun.star.sdbcx.ACallableStatement","com.sun.star.sdbc.CallableStatement"); -#define GET_PARAM() \ - ADOParameter* pParam = NULL; \ - m_pParameters->get_Item(OLEVariant(sal_Int32(columnIndex-1)),&pParam); \ - if(pParam) \ +#define GET_PARAM() \ + ADOParameter* pParam = NULL; \ + m_pParameters->get_Item(OLEVariant(sal_Int32(columnIndex-1)),&pParam); \ + if(pParam) \ pParam->get_Value(&m_aValue); //************************************************************** //************ Class: java.sql.CallableStatement diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx index aa38e4b5123c..f6390431b66a 100644 --- a/connectivity/source/drivers/ado/ACatalog.cxx +++ b/connectivity/source/drivers/ado/ACatalog.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 @@ -58,7 +58,7 @@ OCatalog::~OCatalog() void OCatalog::refreshTables() { TStringVector aVector; - + WpADOTables aTables(m_aCatalog.get_Tables()); if ( aTables.IsValid() ) { @@ -89,7 +89,7 @@ void OCatalog::refreshViews() WpADOViews aViews = m_aCatalog.get_Views(); aViews.fillElementNames(aVector); - + if(m_pViews) m_pViews->reFill(aVector); else @@ -102,7 +102,7 @@ void OCatalog::refreshGroups() WpADOGroups aGroups = m_aCatalog.get_Groups(); aGroups.fillElementNames(aVector); - + if(m_pGroups) m_pGroups->reFill(aVector); else @@ -115,7 +115,7 @@ void OCatalog::refreshUsers() WpADOUsers aUsers = m_aCatalog.get_Users(); aUsers.fillElementNames(aVector); - + if(m_pUsers) m_pUsers->reFill(aVector); else diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 20a91af98a39..cfa5597d6df4 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.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 @@ -72,7 +72,7 @@ OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection,_ADOColumn* _pC construct(); OSL_ENSURE(_pColumn,"Column can not be null!"); m_aColumn = WpADOColumn(_pColumn); - // m_aColumn.put_ParentCatalog(_pConnection->getAdoCatalog()->getCatalog()); + // m_aColumn.put_ParentCatalog(_pConnection->getAdoCatalog()->getCatalog()); fillPropertyValues(); } // ------------------------------------------------------------------------- @@ -116,8 +116,8 @@ void OAdoColumn::construct() { sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType()); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } // ----------------------------------------------------------------------------- void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) @@ -153,7 +153,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r } break; case PROPERTY_ID_TYPENAME: - // rValue <<= m_pTable->getCatalog()->getConnection()->getTypeInfo()->find(); + // rValue <<= m_pTable->getCatalog()->getConnection()->getTypeInfo()->find(); break; case PROPERTY_ID_PRECISION: { @@ -204,16 +204,16 @@ void OAdoColumn::fillPropertyValues() { if(m_aColumn.IsValid()) { - m_IsAscending = m_aColumn.get_SortOrder() == adSortAscending; - m_ReferencedColumn = m_aColumn.get_RelatedColumn(); - m_Name = m_aColumn.get_Name(); - m_Precision = m_aColumn.get_Precision(); - m_Scale = m_aColumn.get_NumericScale(); - m_IsNullable = ((m_aColumn.get_Attributes() & adColNullable) == adColNullable) ? ColumnValue::NULLABLE : ColumnValue::NO_NULLS; + m_IsAscending = m_aColumn.get_SortOrder() == adSortAscending; + m_ReferencedColumn = m_aColumn.get_RelatedColumn(); + m_Name = m_aColumn.get_Name(); + m_Precision = m_aColumn.get_Precision(); + m_Scale = m_aColumn.get_NumericScale(); + m_IsNullable = ((m_aColumn.get_Attributes() & adColNullable) == adColNullable) ? ColumnValue::NULLABLE : ColumnValue::NO_NULLS; - DataTypeEnum eType = m_aColumn.get_Type(); - m_IsCurrency = (eType == adCurrency); - m_Type = ADOS::MapADOType2Jdbc(eType); + DataTypeEnum eType = m_aColumn.get_Type(); + m_IsCurrency = (eType == adCurrency); + m_Type = ADOS::MapADOType2Jdbc(eType); sal_Bool bForceTo = sal_True; const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo(); @@ -249,7 +249,7 @@ void OAdoColumn::fillPropertyValues() if ( pTypeInfo ) { m_TypeName = pTypeInfo->aSimpleType.aTypeName; - m_Type = ADOS::MapADOType2Jdbc(eType); + m_Type = ADOS::MapADOType2Jdbc(eType); } } @@ -280,7 +280,7 @@ void OAdoColumn::fillPropertyValues() } } // ----------------------------------------------------------------------------- -WpADOColumn OAdoColumn::getColumnImpl() const +WpADOColumn OAdoColumn::getColumnImpl() const { return m_aColumn; } diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 377667bc863b..9b2c82f052a7 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.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 @@ -101,10 +101,10 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc ::std::mem_fun(&OExtendedTypeInfo::getDBName), ::std::select2nd<OTypeInfoMap::value_type>()) ) - + ); - if ( aFind != pTypeInfoMap->end() ) // change column type if necessary + if ( aFind != pTypeInfoMap->end() ) // change column type if necessary aColumn.put_Type(aFind->first); if ( SUCCEEDED(((ADOColumns*)m_aCollection)->Append(OLEVariant(aColumn.get_Name()),aColumn.get_Type(),aColumn.get_DefinedSize())) ) @@ -117,7 +117,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc if ( bAutoIncrement ) OTools::putValue( aAddedColumn.get_Properties(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Autoincrement")), bAutoIncrement ); - if ( aFind != pTypeInfoMap->end() && aColumn.get_Type() != aAddedColumn.get_Type() ) // change column type if necessary + if ( aFind != pTypeInfoMap->end() && aColumn.get_Type() != aAddedColumn.get_Type() ) // change column type if necessary aColumn.put_Type(aFind->first); aAddedColumn.put_Precision(aColumn.get_Precision()); aAddedColumn.put_NumericScale(aColumn.get_NumericScale()); diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 87e7c927a9e9..6f42c3641354 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.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 @@ -55,7 +55,7 @@ using namespace com::sun::star::sdbcx; //------------------------------------------------------------------------------ IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.star.sdbc.Connection"); // -------------------------------------------------------------------------------- -OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException) +OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException) : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_bClosed(sal_False), m_xCatalog(NULL), @@ -67,8 +67,8 @@ OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeExcepti { osl_incrementInterlockedCount( &m_refCount ); - IClassFactory2* pIUnknown = NULL; - IUnknown *pOuter = NULL; + IClassFactory2* pIUnknown = NULL; + IUnknown *pOuter = NULL; HRESULT hr; hr = CoGetClassObject( ADOS::CLSID_ADOCONNECTION_21, CLSCTX_INPROC_SERVER, @@ -78,7 +78,7 @@ OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeExcepti if( !FAILED( hr ) ) { - ADOConnection *pCon = NULL; + ADOConnection *pCon = NULL; hr = pIUnknown->CreateInstanceLic( pOuter, NULL, ADOS::IID_ADOCONNECTION_21, @@ -120,8 +120,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV sal_Int32 nTimeout = 20; sal_Bool bSilent = sal_True; - const PropertyValue *pIter = info.getConstArray(); - const PropertyValue *pEnd = pIter + info.getLength(); + const PropertyValue *pIter = info.getConstArray(); + const PropertyValue *pEnd = pIter + info.getLength(); for(;pIter != pEnd;++pIter) { if(!pIter->Name.compareToAscii("Timeout")) @@ -448,26 +448,26 @@ void OConnection::buildTypeInfo() throw( SQLException) do { sal_Int32 nPos = 1; - OExtendedTypeInfo* aInfo = new OExtendedTypeInfo(); - aInfo->aSimpleType.aTypeName = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->eType = (DataTypeEnum)(sal_Int32)ADOS::getField(pRecordset,nPos++).get_Value(); + OExtendedTypeInfo* aInfo = new OExtendedTypeInfo(); + aInfo->aSimpleType.aTypeName = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->eType = (DataTypeEnum)(sal_Int32)ADOS::getField(pRecordset,nPos++).get_Value(); if ( aInfo->eType == adWChar && aInfo->aSimpleType.aTypeName == s_sVarChar ) aInfo->eType = adVarWChar; - aInfo->aSimpleType.nType = (sal_Int16)ADOS::MapADOType2Jdbc(static_cast<DataTypeEnum>(aInfo->eType)); - aInfo->aSimpleType.nPrecision = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.aLiteralPrefix = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.aLiteralSuffix = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.aCreateParams = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.bNullable = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.bCaseSensitive = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.nSearchType = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.bUnsigned = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.bCurrency = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.bAutoIncrement = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.aLocalTypeName = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.nMinimumScale = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.nMaximumScale = ADOS::getField(pRecordset,nPos++).get_Value(); - aInfo->aSimpleType.nNumPrecRadix = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.nType = (sal_Int16)ADOS::MapADOType2Jdbc(static_cast<DataTypeEnum>(aInfo->eType)); + aInfo->aSimpleType.nPrecision = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.aLiteralPrefix = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.aLiteralSuffix = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.aCreateParams = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.bNullable = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.bCaseSensitive = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.nSearchType = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.bUnsigned = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.bCurrency = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.bAutoIncrement = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.aLocalTypeName = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.nMinimumScale = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.nMaximumScale = ADOS::getField(pRecordset,nPos++).get_Value(); + aInfo->aSimpleType.nNumPrecRadix = ADOS::getField(pRecordset,nPos++).get_Value(); // Now that we have the type info, save it // in the Hashtable if we don't already have an // entry for this SQL type. @@ -486,10 +486,10 @@ void OConnection::disposing() OConnection_BASE::disposing(); - m_bClosed = sal_True; + m_bClosed = sal_True; m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>(); m_xCatalog = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier>(); - m_pDriver = NULL; + m_pDriver = NULL; m_pAdoConnection->Close(); @@ -553,11 +553,11 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r sal_Int32 nDBTypeScale = pInfo->aSimpleType.nMaximumScale; (void)nDBTypeScale; sal_Int32 nAdoType = pInfo->eType; (void)nAdoType; #endif - if ( ( !_sTypeName.getLength() - || (pInfo->aSimpleType.aTypeName.equalsIgnoreAsciiCase(_sTypeName)) + if ( ( !_sTypeName.getLength() + || (pInfo->aSimpleType.aTypeName.equalsIgnoreAsciiCase(_sTypeName)) ) - && (pInfo->aSimpleType.nPrecision >= _nPrecision) - && (pInfo->aSimpleType.nMaximumScale >= _nScale) + && (pInfo->aSimpleType.nPrecision >= _nPrecision) + && (pInfo->aSimpleType.nMaximumScale >= _nScale) ) break; @@ -568,19 +568,19 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r for(aIter = aPair.first; aIter != aPair.second; ++aIter) { // search the best matching type (now comparing the local names) - if ( (aIter->second->aSimpleType.aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName)) - && (aIter->second->aSimpleType.nPrecision >= _nPrecision) - && (aIter->second->aSimpleType.nMaximumScale >= _nScale) + if ( (aIter->second->aSimpleType.aLocalTypeName.equalsIgnoreAsciiCase(_sTypeName)) + && (aIter->second->aSimpleType.nPrecision >= _nPrecision) + && (aIter->second->aSimpleType.nMaximumScale >= _nScale) ) { // we can not assert here because we could be in d&d /* OSL_ENSURE(sal_False, - ( ::rtl::OString("getTypeInfoFromType: assuming column type ") - += ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding()) - += ::rtl::OString("\" (expected type name ") - += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) - += ::rtl::OString(" matches the type's local name).")).getStr()); + ( ::rtl::OString("getTypeInfoFromType: assuming column type ") + += ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString("\" (expected type name ") + += ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), gsl_getSystemTextEncoding()) + += ::rtl::OString(" matches the type's local name).")).getStr()); */ break; } @@ -588,7 +588,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r } if (aIter == aPair.second) - { // no match for the names, no match for the local names + { // no match for the names, no match for the local names // -> drop the precision and the scale restriction, accept any type with the property // type id (nType) @@ -617,7 +617,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r } // we can not assert here because we could be in d&d -// OSL_ENSURE(pTypeInfo, "getTypeInfoFromType: no type info found for this type!"); +// OSL_ENSURE(pTypeInfo, "getTypeInfoFromType: no type info found for this type!"); return pTypeInfo; } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index 958aa395b090..f1af30168e00 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.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 @@ -50,7 +50,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -// using namespace connectivity; +// using namespace connectivity; ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo()) @@ -62,7 +62,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) sal_Int32 ODatabaseMetaData::getInt32Property(const ::rtl::OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); - // ADOS::ThrowException(*m_pADOConnection,*this); + // ADOS::ThrowException(*m_pADOConnection,*this); OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection"); ADO_PROP(_aProperty); sal_Int32 nValue(0); @@ -98,7 +98,7 @@ sal_Bool ODatabaseMetaData::getBoolProperty(const ::rtl::OUString& _aProperty) Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) { ADORecordset *pRecordset = m_pADOConnection->getTypeInfo(); - // ADOS::ThrowException(*m_pADOConnection,*this); + // ADOS::ThrowException(*m_pADOConnection,*this); ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset); pResult->setTypeInfoMap(ADOS::isJetEngine(m_pConnection->getEngineType())); @@ -253,7 +253,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLExcept // ------------------------------------------------------------------------- sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) { - // return getInt32Property(::rtl::OUString::createFromAscii("Max Columns in Index")); + // return getInt32Property(::rtl::OUString::createFromAscii("Max Columns in Index")); return 0; } // ------------------------------------------------------------------------- @@ -352,7 +352,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( { Reference< XResultSet > xRef; if(!ADOS::isJetEngine(m_pConnection->getEngineType())) - { // the jet provider doesn't support this method + { // the jet provider doesn't support this method // Create elements used in the array ADORecordset *pRecordset = m_pADOConnection->getTablePrivileges(catalog,schemaPattern,tableNamePattern); @@ -432,7 +432,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLExc return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { return (getInt32Property(::rtl::OUString::createFromAscii("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } @@ -485,7 +485,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { - // return getStringProperty(::rtl::OUString::createFromAscii("Special Characters")); + // return getStringProperty(::rtl::OUString::createFromAscii("Special Characters")); return ::rtl::OUString(); } // ------------------------------------------------------------------------- @@ -494,7 +494,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) return isCapable(DBLITERAL_CORRELATION_NAME); } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) +sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { return getInt32Property(::rtl::OUString::createFromAscii("Catalog Location")) == DBPROPVAL_CL_START; } @@ -603,19 +603,19 @@ sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) { - // return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_TABLE_DEFINITION) == DBPROPVAL_CU_TABLE_DEFINITION; + // return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_TABLE_DEFINITION) == DBPROPVAL_CU_TABLE_DEFINITION; return sal_False; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) { - // return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_INDEX_DEFINITION) == DBPROPVAL_CU_INDEX_DEFINITION; + // return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_INDEX_DEFINITION) == DBPROPVAL_CU_INDEX_DEFINITION; return sal_False; } // ------------------------------------------------------------------------- sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) { - // return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_DML_STATEMENTS) == DBPROPVAL_CU_DML_STATEMENTS; + // return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_DML_STATEMENTS) == DBPROPVAL_CU_DML_STATEMENTS; return sal_False; } // ------------------------------------------------------------------------- @@ -808,7 +808,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw( // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { - // return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_PRIVILEGE_DEFINITION) == DBPROPVAL_CU_PRIVILEGE_DEFINITION; + // return (getInt32Property(::rtl::OUString::createFromAscii("Catalog Usage")) & DBPROPVAL_CU_PRIVILEGE_DEFINITION) == DBPROPVAL_CU_PRIVILEGE_DEFINITION; return sal_False; } // ------------------------------------------------------------------------- @@ -933,7 +933,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc ::rtl::OUString aRet,aComma = ::rtl::OUString::createFromAscii(","); while(!aRecordset.IsAtEOF()) { - WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(aRecordset.GetFields()); + WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(aRecordset.GetFields()); WpADOField aField(aFields.GetItem(0)); aField.get_Value(aValue); aRet = aRet + aValue + aComma; diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index c31e40f44922..4b9282748377 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.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 @@ -72,7 +72,7 @@ void ODatabaseMetaData::fillLiterals() LiteralInfo aInfo; while(!aRecordset.IsAtEOF()) { - WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(aRecordset.GetFields()); + WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(aRecordset.GetFields()); WpADOField aField(aFields.GetItem(1)); aInfo.pwszLiteralValue = aField.get_Value(); aField = aFields.GetItem(5); @@ -423,10 +423,10 @@ void OAdoIndex::fillPropertyValues() { if(m_aIndex.IsValid()) { - m_Name = m_aIndex.get_Name(); - m_IsUnique = m_aIndex.get_Unique(); + m_Name = m_aIndex.get_Name(); + m_IsUnique = m_aIndex.get_Unique(); m_IsPrimaryKeyIndex = m_aIndex.get_PrimaryKey(); - m_IsClustered = m_aIndex.get_Clustered(); + m_IsClustered = m_aIndex.get_Clustered(); } } // ----------------------------------------------------------------------------- @@ -452,11 +452,11 @@ void OAdoKey::fillPropertyValues() { if(m_aKey.IsValid()) { - m_aProps->m_Type = MapKeyRule(m_aKey.get_Type()); - m_Name = m_aKey.get_Name(); - m_aProps->m_ReferencedTable = m_aKey.get_RelatedTable(); - m_aProps->m_UpdateRule = MapRule(m_aKey.get_UpdateRule()); - m_aProps->m_DeleteRule = MapRule(m_aKey.get_DeleteRule()); + m_aProps->m_Type = MapKeyRule(m_aKey.get_Type()); + m_Name = m_aKey.get_Name(); + m_aProps->m_ReferencedTable = m_aKey.get_RelatedTable(); + m_aProps->m_UpdateRule = MapRule(m_aKey.get_UpdateRule()); + m_aProps->m_DeleteRule = MapRule(m_aKey.get_DeleteRule()); } } // ------------------------------------------------------------------------- @@ -572,8 +572,8 @@ void OAdoTable::fillPropertyValues() { if(m_aTable.IsValid()) { - m_Name = m_aTable.get_Name(); - m_Type = m_aTable.get_Type(); + m_Name = m_aTable.get_Name(); + m_Type = m_aTable.get_Type(); { WpADOCatalog aCat(m_aTable.get_ParentCatalog()); if(aCat.IsValid()) diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 08b70797c635..9ae90363f97b 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.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 @@ -80,7 +80,7 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet else m_bOnFirstAfterOpen = sal_False; osl_decrementInterlockedCount( &m_refCount ); - // allocBuffer(); + // allocBuffer(); } // ------------------------------------------------------------------------- @@ -97,7 +97,7 @@ void ODatabaseMetaDataResultSet::disposing(void) ::osl::MutexGuard aGuard(m_aMutex); if(m_pRecordSet) m_pRecordSet->Close(); - m_aStatement = NULL; + m_aStatement = NULL; m_xMetaData.clear(); } // ------------------------------------------------------------------------- @@ -109,7 +109,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th // ------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -554,7 +554,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException) -{ ::osl::MutexGuard aGuard( m_aMutex ); +{ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); checkRecordSet(); @@ -709,11 +709,11 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) Sequence< com::sun::star::beans::Property > aProps(5); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); - DECL_PROP0(RESULTSETTYPE, sal_Int32); + DECL_PROP0(RESULTSETTYPE, sal_Int32); return new ::cppu::OPropertyArrayHelper(aProps); } @@ -804,9 +804,9 @@ void ODatabaseMetaDataResultSet::setProceduresMap() m_aColMapping.push_back(4); TInt2IntMap aMap; - aMap[DB_PT_UNKNOWN] = ProcedureResult::UNKNOWN; - aMap[DB_PT_PROCEDURE] = ProcedureResult::NONE; - aMap[DB_PT_FUNCTION] = ProcedureResult::RETURN; + aMap[DB_PT_UNKNOWN] = ProcedureResult::UNKNOWN; + aMap[DB_PT_PROCEDURE] = ProcedureResult::NONE; + aMap[DB_PT_FUNCTION] = ProcedureResult::RETURN; m_aValueRange[4] = aMap; ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this); @@ -869,46 +869,46 @@ void ODatabaseMetaDataResultSet::setColumnsMap() m_aColMapping.push_back(11); TInt2IntMap aMap; - aMap[adEmpty] = ADOS::MapADOType2Jdbc(adEmpty); - aMap[adTinyInt] = ADOS::MapADOType2Jdbc(adTinyInt); - aMap[adSmallInt] = ADOS::MapADOType2Jdbc(adSmallInt); - aMap[adInteger] = ADOS::MapADOType2Jdbc(adInteger); - aMap[adBigInt] = ADOS::MapADOType2Jdbc(adBigInt); - aMap[adUnsignedTinyInt] = ADOS::MapADOType2Jdbc(adUnsignedTinyInt); + aMap[adEmpty] = ADOS::MapADOType2Jdbc(adEmpty); + aMap[adTinyInt] = ADOS::MapADOType2Jdbc(adTinyInt); + aMap[adSmallInt] = ADOS::MapADOType2Jdbc(adSmallInt); + aMap[adInteger] = ADOS::MapADOType2Jdbc(adInteger); + aMap[adBigInt] = ADOS::MapADOType2Jdbc(adBigInt); + aMap[adUnsignedTinyInt] = ADOS::MapADOType2Jdbc(adUnsignedTinyInt); aMap[adUnsignedSmallInt]= ADOS::MapADOType2Jdbc(adUnsignedSmallInt); - aMap[adUnsignedInt] = ADOS::MapADOType2Jdbc(adUnsignedInt); - aMap[adUnsignedBigInt] = ADOS::MapADOType2Jdbc(adUnsignedBigInt); - aMap[adSingle] = ADOS::MapADOType2Jdbc(adSingle); - aMap[adDouble] = ADOS::MapADOType2Jdbc(adDouble); - aMap[adCurrency] = ADOS::MapADOType2Jdbc(adCurrency); - aMap[adDecimal] = ADOS::MapADOType2Jdbc(adDecimal); - aMap[adNumeric] = ADOS::MapADOType2Jdbc(adNumeric); - aMap[adBoolean] = ADOS::MapADOType2Jdbc(adBoolean); - aMap[adError] = ADOS::MapADOType2Jdbc(adError); - aMap[adUserDefined] = ADOS::MapADOType2Jdbc(adUserDefined); - aMap[adVariant] = ADOS::MapADOType2Jdbc(adVariant); - aMap[adIDispatch] = ADOS::MapADOType2Jdbc(adIDispatch); - aMap[adIUnknown] = ADOS::MapADOType2Jdbc(adIUnknown); - aMap[adGUID] = ADOS::MapADOType2Jdbc(adGUID); - aMap[adDate] = ADOS::MapADOType2Jdbc(adDate); - aMap[adDBDate] = ADOS::MapADOType2Jdbc(adDBDate); - aMap[adDBTime] = ADOS::MapADOType2Jdbc(adDBTime); - aMap[adDBTimeStamp] = ADOS::MapADOType2Jdbc(adDBTimeStamp); - aMap[adBSTR] = ADOS::MapADOType2Jdbc(adBSTR); - aMap[adChar] = ADOS::MapADOType2Jdbc(adChar); - aMap[adVarChar] = ADOS::MapADOType2Jdbc(adVarChar); - aMap[adLongVarChar] = ADOS::MapADOType2Jdbc(adLongVarChar); - aMap[adWChar] = ADOS::MapADOType2Jdbc(adWChar); - aMap[adVarWChar] = ADOS::MapADOType2Jdbc(adVarWChar); - aMap[adLongVarWChar] = ADOS::MapADOType2Jdbc(adLongVarWChar); - aMap[adBinary] = ADOS::MapADOType2Jdbc(adBinary); - aMap[adVarBinary] = ADOS::MapADOType2Jdbc(adVarBinary); - aMap[adLongVarBinary] = ADOS::MapADOType2Jdbc(adLongVarBinary); - aMap[adChapter] = ADOS::MapADOType2Jdbc(adChapter); - aMap[adFileTime] = ADOS::MapADOType2Jdbc(adFileTime); - aMap[adPropVariant] = ADOS::MapADOType2Jdbc(adPropVariant); - aMap[adVarNumeric] = ADOS::MapADOType2Jdbc(adVarNumeric); -// aMap[adArray] = ADOS::MapADOType2Jdbc(adArray); + aMap[adUnsignedInt] = ADOS::MapADOType2Jdbc(adUnsignedInt); + aMap[adUnsignedBigInt] = ADOS::MapADOType2Jdbc(adUnsignedBigInt); + aMap[adSingle] = ADOS::MapADOType2Jdbc(adSingle); + aMap[adDouble] = ADOS::MapADOType2Jdbc(adDouble); + aMap[adCurrency] = ADOS::MapADOType2Jdbc(adCurrency); + aMap[adDecimal] = ADOS::MapADOType2Jdbc(adDecimal); + aMap[adNumeric] = ADOS::MapADOType2Jdbc(adNumeric); + aMap[adBoolean] = ADOS::MapADOType2Jdbc(adBoolean); + aMap[adError] = ADOS::MapADOType2Jdbc(adError); + aMap[adUserDefined] = ADOS::MapADOType2Jdbc(adUserDefined); + aMap[adVariant] = ADOS::MapADOType2Jdbc(adVariant); + aMap[adIDispatch] = ADOS::MapADOType2Jdbc(adIDispatch); + aMap[adIUnknown] = ADOS::MapADOType2Jdbc(adIUnknown); + aMap[adGUID] = ADOS::MapADOType2Jdbc(adGUID); + aMap[adDate] = ADOS::MapADOType2Jdbc(adDate); + aMap[adDBDate] = ADOS::MapADOType2Jdbc(adDBDate); + aMap[adDBTime] = ADOS::MapADOType2Jdbc(adDBTime); + aMap[adDBTimeStamp] = ADOS::MapADOType2Jdbc(adDBTimeStamp); + aMap[adBSTR] = ADOS::MapADOType2Jdbc(adBSTR); + aMap[adChar] = ADOS::MapADOType2Jdbc(adChar); + aMap[adVarChar] = ADOS::MapADOType2Jdbc(adVarChar); + aMap[adLongVarChar] = ADOS::MapADOType2Jdbc(adLongVarChar); + aMap[adWChar] = ADOS::MapADOType2Jdbc(adWChar); + aMap[adVarWChar] = ADOS::MapADOType2Jdbc(adVarWChar); + aMap[adLongVarWChar] = ADOS::MapADOType2Jdbc(adLongVarWChar); + aMap[adBinary] = ADOS::MapADOType2Jdbc(adBinary); + aMap[adVarBinary] = ADOS::MapADOType2Jdbc(adVarBinary); + aMap[adLongVarBinary] = ADOS::MapADOType2Jdbc(adLongVarBinary); + aMap[adChapter] = ADOS::MapADOType2Jdbc(adChapter); + aMap[adFileTime] = ADOS::MapADOType2Jdbc(adFileTime); + aMap[adPropVariant] = ADOS::MapADOType2Jdbc(adPropVariant); + aMap[adVarNumeric] = ADOS::MapADOType2Jdbc(adVarNumeric); +// aMap[adArray] = ADOS::MapADOType2Jdbc(adArray); m_aValueRange[12] = aMap; @@ -1046,9 +1046,9 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap() m_aValueRange[8] = aMap2; ::std::map< sal_Int32,::rtl::OUString> aMap3; - aMap3[0] = ::rtl::OUString(); - aMap3[DB_COLLATION_ASC] = ::rtl::OUString::createFromAscii("A"); - aMap3[DB_COLLATION_DESC] = ::rtl::OUString::createFromAscii("D"); + aMap3[0] = ::rtl::OUString(); + aMap3[DB_COLLATION_ASC] = ::rtl::OUString::createFromAscii("A"); + aMap3[DB_COLLATION_DESC] = ::rtl::OUString::createFromAscii("D"); m_aIntValueRange[21] = aMap3; @@ -1122,61 +1122,61 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(sal_Bool _bJetEngine) m_aStrValueRange[18] = aMap1; TInt2IntMap aMap; - aMap[adEmpty] = ADOS::MapADOType2Jdbc(adEmpty); - aMap[adTinyInt] = ADOS::MapADOType2Jdbc(adTinyInt); - aMap[adSmallInt] = ADOS::MapADOType2Jdbc(adSmallInt); - aMap[adInteger] = ADOS::MapADOType2Jdbc(adInteger); - aMap[adBigInt] = ADOS::MapADOType2Jdbc(adBigInt); - aMap[adUnsignedTinyInt] = ADOS::MapADOType2Jdbc(adUnsignedTinyInt); + aMap[adEmpty] = ADOS::MapADOType2Jdbc(adEmpty); + aMap[adTinyInt] = ADOS::MapADOType2Jdbc(adTinyInt); + aMap[adSmallInt] = ADOS::MapADOType2Jdbc(adSmallInt); + aMap[adInteger] = ADOS::MapADOType2Jdbc(adInteger); + aMap[adBigInt] = ADOS::MapADOType2Jdbc(adBigInt); + aMap[adUnsignedTinyInt] = ADOS::MapADOType2Jdbc(adUnsignedTinyInt); aMap[adUnsignedSmallInt]= ADOS::MapADOType2Jdbc(adUnsignedSmallInt); - aMap[adUnsignedInt] = ADOS::MapADOType2Jdbc(adUnsignedInt); - aMap[adUnsignedBigInt] = ADOS::MapADOType2Jdbc(adUnsignedBigInt); - aMap[adSingle] = ADOS::MapADOType2Jdbc(adSingle); - aMap[adDouble] = ADOS::MapADOType2Jdbc(adDouble); - aMap[adCurrency] = ADOS::MapADOType2Jdbc(adCurrency); - aMap[adDecimal] = ADOS::MapADOType2Jdbc(adDecimal); - aMap[adNumeric] = ADOS::MapADOType2Jdbc(adNumeric); - aMap[adBoolean] = ADOS::MapADOType2Jdbc(adBoolean); - aMap[adError] = ADOS::MapADOType2Jdbc(adError); - aMap[adUserDefined] = ADOS::MapADOType2Jdbc(adUserDefined); - aMap[adVariant] = ADOS::MapADOType2Jdbc(adVariant); - aMap[adIDispatch] = ADOS::MapADOType2Jdbc(adIDispatch); - aMap[adIUnknown] = ADOS::MapADOType2Jdbc(adIUnknown); - aMap[adGUID] = ADOS::MapADOType2Jdbc(adGUID); - aMap[adDate] = _bJetEngine ? ADOS::MapADOType2Jdbc(adDBTimeStamp) : ADOS::MapADOType2Jdbc(adDate); - aMap[adDBDate] = ADOS::MapADOType2Jdbc(adDBDate); - aMap[adDBTime] = ADOS::MapADOType2Jdbc(adDBTime); - aMap[adDBTimeStamp] = ADOS::MapADOType2Jdbc(adDBTimeStamp); - aMap[adBSTR] = ADOS::MapADOType2Jdbc(adBSTR); - aMap[adChar] = ADOS::MapADOType2Jdbc(adChar); - aMap[adVarChar] = ADOS::MapADOType2Jdbc(adVarChar); - aMap[adLongVarChar] = ADOS::MapADOType2Jdbc(adLongVarChar); - aMap[adWChar] = ADOS::MapADOType2Jdbc(adWChar); - aMap[adVarWChar] = ADOS::MapADOType2Jdbc(adVarWChar); - aMap[adLongVarWChar] = ADOS::MapADOType2Jdbc(adLongVarWChar); - aMap[adBinary] = ADOS::MapADOType2Jdbc(adBinary); - aMap[adVarBinary] = ADOS::MapADOType2Jdbc(adVarBinary); - aMap[adLongVarBinary] = ADOS::MapADOType2Jdbc(adLongVarBinary); - aMap[adChapter] = ADOS::MapADOType2Jdbc(adChapter); - aMap[adFileTime] = ADOS::MapADOType2Jdbc(adFileTime); - aMap[adPropVariant] = ADOS::MapADOType2Jdbc(adPropVariant); - aMap[adVarNumeric] = ADOS::MapADOType2Jdbc(adVarNumeric); -// aMap[adArray] = ADOS::MapADOType2Jdbc(adArray); + aMap[adUnsignedInt] = ADOS::MapADOType2Jdbc(adUnsignedInt); + aMap[adUnsignedBigInt] = ADOS::MapADOType2Jdbc(adUnsignedBigInt); + aMap[adSingle] = ADOS::MapADOType2Jdbc(adSingle); + aMap[adDouble] = ADOS::MapADOType2Jdbc(adDouble); + aMap[adCurrency] = ADOS::MapADOType2Jdbc(adCurrency); + aMap[adDecimal] = ADOS::MapADOType2Jdbc(adDecimal); + aMap[adNumeric] = ADOS::MapADOType2Jdbc(adNumeric); + aMap[adBoolean] = ADOS::MapADOType2Jdbc(adBoolean); + aMap[adError] = ADOS::MapADOType2Jdbc(adError); + aMap[adUserDefined] = ADOS::MapADOType2Jdbc(adUserDefined); + aMap[adVariant] = ADOS::MapADOType2Jdbc(adVariant); + aMap[adIDispatch] = ADOS::MapADOType2Jdbc(adIDispatch); + aMap[adIUnknown] = ADOS::MapADOType2Jdbc(adIUnknown); + aMap[adGUID] = ADOS::MapADOType2Jdbc(adGUID); + aMap[adDate] = _bJetEngine ? ADOS::MapADOType2Jdbc(adDBTimeStamp) : ADOS::MapADOType2Jdbc(adDate); + aMap[adDBDate] = ADOS::MapADOType2Jdbc(adDBDate); + aMap[adDBTime] = ADOS::MapADOType2Jdbc(adDBTime); + aMap[adDBTimeStamp] = ADOS::MapADOType2Jdbc(adDBTimeStamp); + aMap[adBSTR] = ADOS::MapADOType2Jdbc(adBSTR); + aMap[adChar] = ADOS::MapADOType2Jdbc(adChar); + aMap[adVarChar] = ADOS::MapADOType2Jdbc(adVarChar); + aMap[adLongVarChar] = ADOS::MapADOType2Jdbc(adLongVarChar); + aMap[adWChar] = ADOS::MapADOType2Jdbc(adWChar); + aMap[adVarWChar] = ADOS::MapADOType2Jdbc(adVarWChar); + aMap[adLongVarWChar] = ADOS::MapADOType2Jdbc(adLongVarWChar); + aMap[adBinary] = ADOS::MapADOType2Jdbc(adBinary); + aMap[adVarBinary] = ADOS::MapADOType2Jdbc(adVarBinary); + aMap[adLongVarBinary] = ADOS::MapADOType2Jdbc(adLongVarBinary); + aMap[adChapter] = ADOS::MapADOType2Jdbc(adChapter); + aMap[adFileTime] = ADOS::MapADOType2Jdbc(adFileTime); + aMap[adPropVariant] = ADOS::MapADOType2Jdbc(adPropVariant); + aMap[adVarNumeric] = ADOS::MapADOType2Jdbc(adVarNumeric); +// aMap[adArray] = ADOS::MapADOType2Jdbc(adArray); m_aValueRange[2] = aMap; TInt2IntMap aColumnValueMapping; - aColumnValueMapping[VARIANT_FALSE] = ColumnValue::NO_NULLS; - aColumnValueMapping[VARIANT_TRUE] = ColumnValue::NULLABLE; + aColumnValueMapping[VARIANT_FALSE] = ColumnValue::NO_NULLS; + aColumnValueMapping[VARIANT_TRUE] = ColumnValue::NULLABLE; m_aValueRange[7] = aColumnValueMapping; // now adjust the column mapping // OJ 24.01.2002 96860 TInt2IntMap aSerachMapping; - aSerachMapping[DB_UNSEARCHABLE] = ColumnSearch::NONE; - aSerachMapping[DB_LIKE_ONLY] = ColumnSearch::CHAR; - aSerachMapping[DB_ALL_EXCEPT_LIKE] = ColumnSearch::BASIC; - aSerachMapping[DB_SEARCHABLE] = ColumnSearch::FULL; + aSerachMapping[DB_UNSEARCHABLE] = ColumnSearch::NONE; + aSerachMapping[DB_LIKE_ONLY] = ColumnSearch::CHAR; + aSerachMapping[DB_ALL_EXCEPT_LIKE] = ColumnSearch::BASIC; + aSerachMapping[DB_SEARCHABLE] = ColumnSearch::FULL; m_aValueRange[9] = aSerachMapping; diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index 12c250564113..e39ea65ead91 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.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 @@ -85,10 +85,10 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw( if(m_vMapping.size()) return m_mColumns.size(); - - ADOFields* pFields = NULL; + + ADOFields* pFields = NULL; m_pRecordSet->get_Fields(&pFields); - WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); + WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); m_nColCount = aFields.GetItemCount(); return m_nColCount; } @@ -176,7 +176,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isNullable(); - + if(!m_pRecordSet) return 0; @@ -200,7 +200,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 colu WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]); if(aField.IsValid()) { - // return (aField.GetStatus() & adFieldReadOnly) == adFieldReadOnly; + // return (aField.GetStatus() & adFieldReadOnly) == adFieldReadOnly; } return sal_False; } diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 060764faea89..5fd1e3d17914 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.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/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 05267df5ced2..d02204b1ec19 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.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 @@ -64,7 +64,7 @@ void WpADOGroup::Create() } } // ------------------------------------------------------------------------- -OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, ADOGroup* _pGroup) : OGroup_ADO(_bCase),m_pCatalog(_pParent) +OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, ADOGroup* _pGroup) : OGroup_ADO(_bCase),m_pCatalog(_pParent) { construct(); if(_pGroup) diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index 8efca9efef7e..269a315daaf6 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.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/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index 468c1e9ba943..906d03fb2312 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.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/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index 8969747eb192..7b645e6223b9 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.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 @@ -66,7 +66,7 @@ Reference< XPropertySet > OIndexes::createDescriptor() // ------------------------------------------------------------------------- // XAppend sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) -{ +{ OAdoIndex* pIndex = NULL; if ( !getImplementation(pIndex,descriptor) || pIndex == NULL ) m_pConnection->throwGenericSQLException( STR_INVALID_INDEX_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) ); diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index 43c8fd3dc419..6407881fd4be 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.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/source/drivers/ado/AKeyColumn.cxx b/connectivity/source/drivers/ado/AKeyColumn.cxx index 00da790fee89..ff0bb3cafd8b 100644 --- a/connectivity/source/drivers/ado/AKeyColumn.cxx +++ b/connectivity/source/drivers/ado/AKeyColumn.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 @@ -32,31 +32,31 @@ #include "adabas/BKeyColumn.hxx" using namespace connectivity::adabas; -namespace starbeans = ::com::sun::star::beans; +namespace starbeans = ::com::sun::star::beans; // ------------------------------------------------------------------------- OKeyColumn::OKeyColumn() : OColumn() { construct(); } // ------------------------------------------------------------------------- -OKeyColumn::OKeyColumn( const ::rtl::OUString& _ReferencedColumn, - const ::rtl::OUString& _Name, +OKeyColumn::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 - ) : OColumn(_Name, - _TypeName, + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement + ) : OColumn(_Name, + _TypeName, _DefaultValue, _IsNullable, _Precision, _Scale, _Type, _IsAutoIncrement) - , m_ReferencedColumn(_ReferencedColumn) + , m_ReferencedColumn(_ReferencedColumn) { construct(); } @@ -65,7 +65,7 @@ OKeyColumn::OKeyColumn( const ::rtl::OUString& _ReferencedColumn, void OKeyColumn::construct() { sal_Int32 nAttrib = isNew() ? 0 : starbeans::PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AKeyColumns.cxx b/connectivity/source/drivers/ado/AKeyColumns.cxx index 2dd66136a211..f7449bf1a3e6 100644 --- a/connectivity/source/drivers/ado/AKeyColumns.cxx +++ b/connectivity/source/drivers/ado/AKeyColumns.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 @@ -41,7 +41,7 @@ using namespace connectivity::adabas; sdbcx::ObjectType OKeyColumns::createObject(const ::rtl::OUString& _rName) { - Reference< starsdbc::XResultSet > + Reference< starsdbc::XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getImportedKeys(Any(), m_pTable->getSchema(),m_pTable->getName()); @@ -49,7 +49,7 @@ sdbcx::ObjectType OKeyColumns::createObject(const ::rtl::OUString& _rName) if(xResult.is()) { Reference< starsdbc::XRow > xRow(xResult,UNO_QUERY); - while(xResult->next()) + while(xResult->next()) { if(xRow->getString(8) == _rName) { @@ -58,7 +58,7 @@ sdbcx::ObjectType OKeyColumns::createObject(const ::rtl::OUString& _rName) } } } - + xResult = m_pTable->getConnection()->getMetaData()->getColumns(Any(), m_pTable->getSchema(),m_pTable->getName(),_rName); @@ -66,7 +66,7 @@ sdbcx::ObjectType OKeyColumns::createObject(const ::rtl::OUString& _rName) if(xResult.is()) { Reference< starsdbc::XRow > xRow(xResult,UNO_QUERY); - if(xResult->next()) + if(xResult->next()) { if(xRow->getString(4) == _rName) { diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index 8c38fe014c58..2966f55b5567 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.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 @@ -76,7 +76,7 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference< // To pass as column parameter to Key's Apppend method OLEVariant vOptional; vOptional.setNoArg(); - + #if OSL_DEBUG_LEVEL > 0 KeyTypeEnum eKey = #endif diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 433ed279ba2e..11a15656ddef 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.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 @@ -43,12 +43,12 @@ #include <limits> -#define CHECK_RETURN(x) \ - if(!x) \ +#define CHECK_RETURN(x) \ + if(!x) \ ADOS::ThrowException(*m_pConnection->getConnection(),*this); #ifdef max -# undef max +# undef max #endif //------------------------------------------------------------------------------ @@ -75,7 +75,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInf ::rtl::OUString sNewSql; OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,sql); if(pNode) - { // special handling for parameters + { // special handling for parameters /* we recusive replace all occurences of ? in the statement and replace them with name like "æ¬å" */ sal_Int32 nParameterCount = 0; ::rtl::OUString sDefaultName = ::rtl::OUString::createFromAscii("parame"); @@ -110,7 +110,7 @@ OPreparedStatement::~OPreparedStatement() Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = OStatement_Base::queryInterface(rType); - return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, + return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, static_cast< XPreparedStatement*>(this), static_cast< XParameters*>(this), static_cast< XPreparedBatchExecution*>(this), @@ -119,7 +119,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt // ------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedBatchExecution > *)0 )); @@ -166,7 +166,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc checkDisposed(OStatement_BASE::rBHelper.bDisposed); - SQLWarning warning; + SQLWarning warning; // Reset warnings @@ -174,7 +174,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc // Reset the statement handle, warning and saved Resultset - // reset(); + // reset(); // Call SQLExecute @@ -446,7 +446,7 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any ) ); ::dbtools::throwGenericSQLException(sError,*this); } - // setObject (parameterIndex, x, sqlType, 0); + // setObject (parameterIndex, x, sqlType, 0); } // ------------------------------------------------------------------------- @@ -505,15 +505,15 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim CHECK_RETURN(aParam.PutValue(aVal)); } } - // m_pParameters->Delete(OLEVariant(i)); + // m_pParameters->Delete(OLEVariant(i)); } } // ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeException) { - // clearParameters( ); - // m_aBatchList.erase(); + // clearParameters( ); + // m_aBatchList.erase(); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 169039ed6e2b..3a1f484bf01c 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.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 @@ -51,8 +51,8 @@ using namespace ::comphelper; #include <oledb.h> -#define CHECK_RETURN(x) \ - if(!SUCCEEDED(x)) \ +#define CHECK_RETURN(x) \ + if(!SUCCEEDED(x)) \ ADOS::ThrowException(*m_pStmt->m_pConnection->getConnection(),*this); using namespace connectivity::ado; @@ -62,8 +62,8 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; //------------------------------------------------------------------------------ -// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); -::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ +// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); +::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ado.ResultSet"); } @@ -87,7 +87,7 @@ sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceN return pSupported != pEnd; } // ------------------------------------------------------------------------- -OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : OResultSet_BASE(m_aMutex) +OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : OResultSet_BASE(m_aMutex) ,OPropertySetHelper(OResultSet_BASE::rBHelper) ,m_xStatement(*pStmt) ,m_pStmt(pStmt) @@ -98,7 +98,7 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : ORes { } // ------------------------------------------------------------------------- -OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex) +OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex) ,OPropertySetHelper(OResultSet_BASE::rBHelper) ,m_xStatement(NULL) ,m_xMetaData(NULL) @@ -149,7 +149,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep // ------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -464,7 +464,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - if(!row) // absolute with zero not allowed + if(!row) // absolute with zero not allowed ::dbtools::throwFunctionSequenceException(*this); sal_Bool bCheck = sal_True; @@ -548,7 +548,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) -{ ::osl::MutexGuard aGuard( m_aMutex ); +{ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -883,7 +883,7 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& first, const Any& se first >>= nPos1; sal_Int32 nPos2; second >>= nPos2; - if(nPos1 == nPos2) // they should be equal + if(nPos1 == nPos2) // they should be equal return sal_True; OSL_ENSURE((nPos1 >= 0 && nPos1 < (sal_Int32)m_aBookmarks.size()) || (nPos1 >= 0 && nPos2 < (sal_Int32)m_aBookmarks.size()),"Invalid Index for vector"); @@ -1063,12 +1063,12 @@ void OResultSet::setFetchSize(sal_Int32 _par0) com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - // DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + // DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); - DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); + DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); return new ::cppu::OPropertyArrayHelper(aProps); } diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index 859d261ebfe6..66def0a9cb98 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.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 @@ -42,7 +42,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; OResultSetMetaData::OResultSetMetaData( ADORecordset* _pRecordSet) - : m_pRecordSet(_pRecordSet), + : m_pRecordSet(_pRecordSet), m_nColCount(-1) { if ( m_pRecordSet ) @@ -79,9 +79,9 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru if ( !m_pRecordSet ) return 0; - ADOFields* pFields = NULL; + ADOFields* pFields = NULL; m_pRecordSet->get_Fields(&pFields); - WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); + WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); m_nColCount = aFields.GetItemCount(); return m_nColCount; } @@ -238,7 +238,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) { - // return (aField.GetStatus() & adFieldReadOnly) == adFieldReadOnly; + // return (aField.GetStatus() & adFieldReadOnly) == adFieldReadOnly; } return sal_False; } diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 04612e22d22f..7e06678a26dd 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.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 @@ -48,8 +48,8 @@ using namespace ::comphelper; -#define CHECK_RETURN(x) \ - if(!x) \ +#define CHECK_RETURN(x) \ + if(!x) \ ADOS::ThrowException(*m_pConnection->getConnection(),*this); @@ -63,7 +63,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace ::std; //------------------------------------------------------------------------------ -OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE(m_aMutex) +OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE(m_aMutex) ,OPropertySetHelper(OStatement_BASE::rBHelper) ,OSubComponent<OStatement_Base, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this) ,m_pConnection(_pConnection) @@ -133,7 +133,7 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime // ------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OStatement_Base::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -240,7 +240,7 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType) // Sets the warning //-------------------------------------------------------------------- -void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) +void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -456,7 +456,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim checkDisposed(OStatement_BASE::rBHelper.bDisposed); - SQLWarning warning; + SQLWarning warning; // clear previous warnings @@ -642,7 +642,7 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeE m_nFetchSize = _par0; - // m_RecordSet.put_CacheSize(_par0); + // m_RecordSet.put_CacheSize(_par0); } //------------------------------------------------------------------------------ void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException) @@ -666,12 +666,12 @@ void OStatement_Base::setCursorName(const ::rtl::OUString &_par0) throw(SQLExcep Sequence< com::sun::star::beans::Property > aProps(10); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -734,7 +734,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( } catch( const Exception& e ) { - bModified = sal_True; // will ensure that the property is set + bModified = sal_True; // will ensure that the property is set OSL_ENSURE( sal_False, "OStatement_Base::convertFastPropertyValue: caught something strange!" ); (void)e; } @@ -770,9 +770,9 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A setFetchSize(comphelper::getINT32(rValue)); break; case PROPERTY_ID_ESCAPEPROCESSING: - // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); + // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); case PROPERTY_ID_USEBOOKMARKS: - // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); + // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); default: ; } diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index d3f74f6c777a..a4fadaa02b9e 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.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 @@ -64,7 +64,7 @@ OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCa { construct(); m_aTable = WpADOTable(_pTable); - // m_aTable.putref_ParentCatalog(_pCatalog->getCatalog()); + // m_aTable.putref_ParentCatalog(_pCatalog->getCatalog()); fillPropertyValues(); } @@ -220,13 +220,13 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV break; case PROPERTY_ID_TYPE: - OTools::putValue( m_aTable.get_Properties(), + OTools::putValue( m_aTable.get_Properties(), OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), getString(rValue)); break; case PROPERTY_ID_DESCRIPTION: - OTools::putValue( m_aTable.get_Properties(), + OTools::putValue( m_aTable.get_Properties(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")), getString(rValue)); break; diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx index acb096545101..c9872c4bc7bc 100644 --- a/connectivity/source/drivers/ado/ATables.cxx +++ b/connectivity/source/drivers/ado/ATables.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/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 7dc882050145..350f0362ab27 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.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 @@ -133,7 +133,7 @@ void OAdoUser::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const } } // ------------------------------------------------------------------------- -OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) +OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) : OAdoUser(_pParent,_bCase,_pUser) { } @@ -147,7 +147,7 @@ OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUStri void OUserExtend::construct() { OUser_TYPEDEF::construct(); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } // ----------------------------------------------------------------------------- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index 4e4cce3ce14a..e1abe6f2c924 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.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/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index ac4fef472b65..a5bc0d549109 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.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 @@ -45,7 +45,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -// IMPLEMENT_SERVICE_INFO(OAdoView,"com.sun.star.sdbcx.AView","com.sun.star.sdbcx.View"); +// IMPLEMENT_SERVICE_INFO(OAdoView,"com.sun.star.sdbcx.AView","com.sun.star.sdbcx.View"); // ------------------------------------------------------------------------- OAdoView::OAdoView(sal_Bool _bCase,ADOView* _pView) : OView_ADO(_bCase,NULL) ,m_aView(_pView) @@ -89,7 +89,7 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const case PROPERTY_ID_CATALOGNAME: break; case PROPERTY_ID_SCHEMANAME: - // rValue <<= m_aView.get_Type(); + // rValue <<= m_aView.get_Type(); break; case PROPERTY_ID_COMMAND: { diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx index dee7d4ac6a64..bf99464dfa43 100644 --- a/connectivity/source/drivers/ado/AViews.cxx +++ b/connectivity/source/drivers/ado/AViews.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/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index c8ea5d87bfab..136c81b9238e 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.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 @@ -125,17 +125,17 @@ OLEVariant::OLEVariant(const OLEVariant& varSrc) OSL_UNUSED(eRet); } -OLEVariant::OLEVariant(sal_Bool x) { VariantInit(this); vt = VT_BOOL; boolVal = (x ? VARIANT_TRUE : VARIANT_FALSE);} -OLEVariant::OLEVariant(sal_Int8 n) { VariantInit(this); vt = VT_I1; bVal = n;} -OLEVariant::OLEVariant(sal_Int16 n) { VariantInit(this); vt = VT_I2; intVal = n;} -OLEVariant::OLEVariant(sal_Int32 n) { VariantInit(this); vt = VT_I4; lVal = n;} -OLEVariant::OLEVariant(sal_Int64 x) { VariantInit(this); vt = VT_I4; lVal = (LONG)x;} +OLEVariant::OLEVariant(sal_Bool x) { VariantInit(this); vt = VT_BOOL; boolVal = (x ? VARIANT_TRUE : VARIANT_FALSE);} +OLEVariant::OLEVariant(sal_Int8 n) { VariantInit(this); vt = VT_I1; bVal = n;} +OLEVariant::OLEVariant(sal_Int16 n) { VariantInit(this); vt = VT_I2; intVal = n;} +OLEVariant::OLEVariant(sal_Int32 n) { VariantInit(this); vt = VT_I4; lVal = n;} +OLEVariant::OLEVariant(sal_Int64 x) { VariantInit(this); vt = VT_I4; lVal = (LONG)x;} OLEVariant::OLEVariant(const rtl::OUString& us) { ::VariantInit(this); - vt = VT_BSTR; - bstrVal = SysAllocString(reinterpret_cast<LPCOLESTR>(us.getStr())); + vt = VT_BSTR; + bstrVal = SysAllocString(reinterpret_cast<LPCOLESTR>(us.getStr())); } OLEVariant::~OLEVariant() { @@ -147,32 +147,32 @@ OLEVariant::~OLEVariant() OLEVariant::OLEVariant(const ::com::sun::star::util::Date& x ) { VariantInit(this); - vt = VT_DATE; - dblVal = ::dbtools::DBTypeConversion::toDouble(x,::com::sun::star::util::Date(30,12,1899)); + vt = VT_DATE; + dblVal = ::dbtools::DBTypeConversion::toDouble(x,::com::sun::star::util::Date(30,12,1899)); } OLEVariant::OLEVariant(const ::com::sun::star::util::Time& x ) { VariantInit(this); - vt = VT_DATE; - dblVal = ::dbtools::DBTypeConversion::toDouble(x); + vt = VT_DATE; + dblVal = ::dbtools::DBTypeConversion::toDouble(x); } OLEVariant::OLEVariant(const ::com::sun::star::util::DateTime& x ) { VariantInit(this); - vt = VT_DATE; - dblVal = ::dbtools::DBTypeConversion::toDouble(x,::com::sun::star::util::Date(30,12,1899)); + vt = VT_DATE; + dblVal = ::dbtools::DBTypeConversion::toDouble(x,::com::sun::star::util::Date(30,12,1899)); } OLEVariant::OLEVariant(const float &x) { VariantInit(this); - vt = VT_R4; - fltVal = x; + vt = VT_R4; + fltVal = x; } OLEVariant::OLEVariant(const double &x) { VariantInit(this); - vt = VT_R8; - dblVal = x; + vt = VT_R8; + dblVal = x; } @@ -186,13 +186,13 @@ OLEVariant::OLEVariant(const ::com::sun::star::uno::Sequence< sal_Int8 >& x) { VariantInit(this); - vt = VT_ARRAY|VT_UI1; + vt = VT_ARRAY|VT_UI1; SAFEARRAYBOUND rgsabound[1]; rgsabound[0].lLbound = 0; rgsabound[0].cElements = x.getLength(); - // parray = SafeArrayCreate(VT_UI1,1,rgsabound); - parray = SafeArrayCreateVector(VT_UI1, 0, x.getLength()); + // parray = SafeArrayCreate(VT_UI1,1,rgsabound); + parray = SafeArrayCreateVector(VT_UI1, 0, x.getLength()); const sal_Int8* pBegin = x.getConstArray(); const sal_Int8* pEnd = pBegin + x.getLength(); @@ -247,38 +247,38 @@ void OLEVariant::setInt16(sal_Int16 n) HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); - vt = VT_I2; - iVal = n; + vt = VT_I2; + iVal = n; } void OLEVariant::setInt32(sal_Int32 n) { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); - vt = VT_I4; - lVal = n; + vt = VT_I4; + lVal = n; } void OLEVariant::setFloat(float f) -{ HRESULT eRet = VariantClear(this); +{ HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); - vt = VT_R4; - fltVal = f; + vt = VT_R4; + fltVal = f; } void OLEVariant::setDouble(double d) { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); - vt = VT_R8; - dblVal = d; + vt = VT_R8; + dblVal = d; } void OLEVariant::setDate(DATE d) -{ HRESULT eRet = VariantClear(this); +{ HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); - vt = VT_DATE; - date = d; + vt = VT_DATE; + date = d; } void OLEVariant::setChar(unsigned char a) { @@ -286,7 +286,7 @@ void OLEVariant::setChar(unsigned char a) OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); vt = VT_UI1; - bVal = a; + bVal = a; } void OLEVariant::setCurrency(double aCur) { @@ -302,7 +302,7 @@ void OLEVariant::setBool(sal_Bool b) OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); vt = VT_BOOL; - boolVal = b ? VARIANT_TRUE : VARIANT_FALSE; + boolVal = b ? VARIANT_TRUE : VARIANT_FALSE; } void OLEVariant::setString(const rtl::OUString& us) { @@ -310,7 +310,7 @@ void OLEVariant::setString(const rtl::OUString& us) OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); vt = VT_BSTR; - bstrVal = ::SysAllocString(reinterpret_cast<LPCOLESTR>(us.getStr())); + bstrVal = ::SysAllocString(reinterpret_cast<LPCOLESTR>(us.getStr())); } void OLEVariant::setNoArg() { @@ -318,7 +318,7 @@ void OLEVariant::setNoArg() OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); vt = VT_ERROR; - scode = DISP_E_PARAMNOTFOUND; + scode = DISP_E_PARAMNOTFOUND; } void OLEVariant::setNull() @@ -367,8 +367,8 @@ void OLEVariant::setIDispatch(IDispatch* pDispInterface) } -sal_Bool OLEVariant::isNull() const { return (vt == VT_NULL); } -sal_Bool OLEVariant::isEmpty() const { return (vt == VT_EMPTY); } +sal_Bool OLEVariant::isNull() const { return (vt == VT_NULL); } +sal_Bool OLEVariant::isEmpty() const { return (vt == VT_EMPTY); } VARTYPE OLEVariant::getType() const { return vt; } @@ -376,7 +376,7 @@ OLEVariant::operator ::com::sun::star::util::Date() const { return isNull() ? ::com::sun::star::util::Date(30,12,1899) : ::dbtools::DBTypeConversion::toDate(getDate(),::com::sun::star::util::Date(30,12,1899)); } -OLEVariant::operator ::com::sun::star::util::Time() const +OLEVariant::operator ::com::sun::star::util::Time() const { return isNull() ? ::com::sun::star::util::Time() : ::dbtools::DBTypeConversion::toTime(getDate()); } @@ -437,11 +437,11 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) if (pSrc == NULL) pSrc = this; - if ( ( this != pSrc ) - || ( vartype != V_VT( this ) ) + if ( ( this != pSrc ) + || ( vartype != V_VT( this ) ) ) { - if ( FAILED( ::VariantChangeType( static_cast< VARIANT* >( this ), + if ( FAILED( ::VariantChangeType( static_cast< VARIANT* >( this ), const_cast< VARIANT* >( static_cast< const VARIANT* >( pSrc ) ), 0, vartype ) ) ) diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index 7d5aa5e22a59..b182b9327710 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.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 @@ -115,8 +115,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine"; diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx index bc9bb2948608..37a64258cb9b 100644 --- a/connectivity/source/drivers/ado/Awrapado.cxx +++ b/connectivity/source/drivers/ado/Awrapado.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 @@ -289,8 +289,8 @@ void WpADOCommand::put_ActiveConnection(/* [in] */ const OLEVariant& vConn) void WpADOCommand::Create() { - IClassFactory2* pInterface2 = NULL; - IUnknown *pOuter = NULL; + IClassFactory2* pInterface2 = NULL; + IUnknown *pOuter = NULL; HRESULT hr; hr = CoGetClassObject( ADOS::CLSID_ADOCOMMAND_21, CLSCTX_INPROC_SERVER, @@ -502,7 +502,7 @@ sal_Int32 WpADOField::GetStatus() const { OSL_ENSURE(pInterface,"Interface is null!"); sal_Int32 eADOSFieldAttributes=0; - // pInterface->get_Status(&eADOSFieldAttributes); + // pInterface->get_Status(&eADOSFieldAttributes); return eADOSFieldAttributes; } @@ -699,8 +699,8 @@ sal_Bool WpADOProperty::PutValue(const OLEVariant &aValVar) } void WpADORecordset::Create() { - IClassFactory2* pInterface2 = NULL; - IUnknown *pOuter = NULL; + IClassFactory2* pInterface2 = NULL; + IUnknown *pOuter = NULL; HRESULT hr; hr = CoGetClassObject( ADOS::CLSID_ADORECORDSET_21, CLSCTX_INPROC_SERVER, @@ -836,11 +836,11 @@ WpADOFields WpADORecordset::GetFields() const } - sal_Bool WpADORecordset::Move(sal_Int32 nRows, VARIANT aBmk) {return pInterface && SUCCEEDED(pInterface->Move(nRows, aBmk));} + sal_Bool WpADORecordset::Move(sal_Int32 nRows, VARIANT aBmk) {return pInterface && SUCCEEDED(pInterface->Move(nRows, aBmk));} sal_Bool WpADORecordset::MoveNext() {return pInterface && SUCCEEDED(pInterface->MoveNext());} sal_Bool WpADORecordset::MovePrevious() {return pInterface && SUCCEEDED(pInterface->MovePrevious());} sal_Bool WpADORecordset::MoveFirst() {return pInterface && SUCCEEDED(pInterface->MoveFirst());} - sal_Bool WpADORecordset::MoveLast() {return pInterface && SUCCEEDED(pInterface->MoveLast());} + sal_Bool WpADORecordset::MoveLast() {return pInterface && SUCCEEDED(pInterface->MoveLast());} sal_Bool WpADORecordset::IsAtBOF() const { @@ -1319,7 +1319,7 @@ void WpADOCatalog::putref_ActiveConnection(IDispatch* pCon) pInterface->putref_ActiveConnection(pCon); } -WpADOTables WpADOCatalog::get_Tables() +WpADOTables WpADOCatalog::get_Tables() { OSL_ENSURE(pInterface,"Interface is null!"); ADOTables* pRet = NULL; @@ -1568,7 +1568,7 @@ WpBase::WpBase(IDispatch* pInt) { ULONG nCount = pIUnknown->AddRef(); (void)nCount; - // OSL_ENSURE(nCount == 1,"Count is greater than 1"); + // OSL_ENSURE(nCount == 1,"Count is greater than 1"); } } diff --git a/connectivity/source/drivers/ado/ado.xcu b/connectivity/source/drivers/ado/ado.xcu index 50c29cf7ba2e..3f822de5f75e 100755 --- a/connectivity/source/drivers/ado/ado.xcu +++ b/connectivity/source/drivers/ado/ado.xcu @@ -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/source/drivers/ado/ado.xml b/connectivity/source/drivers/ado/ado.xml index e60318939d1f..2be460df8f5a 100644 --- a/connectivity/source/drivers/ado/ado.xml +++ b/connectivity/source/drivers/ado/ado.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> ado </module-name> + <module-name> ado </module-name> <component-description> <author>Ocke Janssen</author> <name>com.sun.star.comp.sdbc.ado.ODriver</name> @@ -11,8 +11,8 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service> com.sun.star.sdbc.Driver</supported-service> - </component-description> + <supported-service> com.sun.star.sdbc.Driver</supported-service> + </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>sal</project-build-dependency> diff --git a/connectivity/source/drivers/ado/ado_post_sys_include.h b/connectivity/source/drivers/ado/ado_post_sys_include.h index c3110010b04d..459fa2948908 100644 --- a/connectivity/source/drivers/ado/ado_post_sys_include.h +++ b/connectivity/source/drivers/ado/ado_post_sys_include.h @@ -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/source/drivers/ado/ado_pre_sys_include.h b/connectivity/source/drivers/ado/ado_pre_sys_include.h index 0393e96d285c..b1ac0e3e517d 100644 --- a/connectivity/source/drivers/ado/ado_pre_sys_include.h +++ b/connectivity/source/drivers/ado/ado_pre_sys_include.h @@ -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/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index c6df59087faf..ad6c2e915e9f 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.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 @@ -45,38 +45,38 @@ using namespace com::sun::star::sdbcx; #define MYADOID(l) {l, 0,0x10,0x80,0,0,0xAA,0,0x6D,0x2E,0xA4}; -const CLSID ADOS::CLSID_ADOCONNECTION_21 = MYADOID(0x00000514); -const IID ADOS::IID_ADOCONNECTION_21 = MYADOID(0x00000550); +const CLSID ADOS::CLSID_ADOCONNECTION_21 = MYADOID(0x00000514); +const IID ADOS::IID_ADOCONNECTION_21 = MYADOID(0x00000550); -const CLSID ADOS::CLSID_ADOCOMMAND_21 = MYADOID(0x00000507); -const IID ADOS::IID_ADOCOMMAND_21 = MYADOID(0x0000054E); +const CLSID ADOS::CLSID_ADOCOMMAND_21 = MYADOID(0x00000507); +const IID ADOS::IID_ADOCOMMAND_21 = MYADOID(0x0000054E); -const CLSID ADOS::CLSID_ADORECORDSET_21 = MYADOID(0x00000535); -const IID ADOS::IID_ADORECORDSET_21 = MYADOID(0x0000054F); +const CLSID ADOS::CLSID_ADORECORDSET_21 = MYADOID(0x00000535); +const IID ADOS::IID_ADORECORDSET_21 = MYADOID(0x0000054F); -const CLSID ADOS::CLSID_ADOCATALOG_25 = MYADOID(0x00000602); -const IID ADOS::IID_ADOCATALOG_25 = MYADOID(0x00000603); +const CLSID ADOS::CLSID_ADOCATALOG_25 = MYADOID(0x00000602); +const IID ADOS::IID_ADOCATALOG_25 = MYADOID(0x00000603); -const CLSID ADOS::CLSID_ADOINDEX_25 = MYADOID(0x0000061E); -const IID ADOS::IID_ADOINDEX_25 = MYADOID(0x0000061F); +const CLSID ADOS::CLSID_ADOINDEX_25 = MYADOID(0x0000061E); +const IID ADOS::IID_ADOINDEX_25 = MYADOID(0x0000061F); -const CLSID ADOS::CLSID_ADOTABLE_25 = MYADOID(0x00000609); -const IID ADOS::IID_ADOTABLE_25 = MYADOID(0x00000610); +const CLSID ADOS::CLSID_ADOTABLE_25 = MYADOID(0x00000609); +const IID ADOS::IID_ADOTABLE_25 = MYADOID(0x00000610); -const CLSID ADOS::CLSID_ADOKEY_25 = MYADOID(0x00000621); -const IID ADOS::IID_ADOKEY_25 = MYADOID(0x00000622); +const CLSID ADOS::CLSID_ADOKEY_25 = MYADOID(0x00000621); +const IID ADOS::IID_ADOKEY_25 = MYADOID(0x00000622); -const CLSID ADOS::CLSID_ADOCOLUMN_25 = MYADOID(0x0000061B); -const IID ADOS::IID_ADOCOLUMN_25 = MYADOID(0x0000061C); +const CLSID ADOS::CLSID_ADOCOLUMN_25 = MYADOID(0x0000061B); +const IID ADOS::IID_ADOCOLUMN_25 = MYADOID(0x0000061C); -const CLSID ADOS::CLSID_ADOGROUP_25 = MYADOID(0x00000615); -const IID ADOS::IID_ADOGROUP_25 = MYADOID(0x00000616); +const CLSID ADOS::CLSID_ADOGROUP_25 = MYADOID(0x00000615); +const IID ADOS::IID_ADOGROUP_25 = MYADOID(0x00000616); -const CLSID ADOS::CLSID_ADOUSER_25 = MYADOID(0x00000618); -const IID ADOS::IID_ADOUSER_25 = MYADOID(0x00000619); +const CLSID ADOS::CLSID_ADOUSER_25 = MYADOID(0x00000618); +const IID ADOS::IID_ADOUSER_25 = MYADOID(0x00000619); -const CLSID ADOS::CLSID_ADOVIEW_25 = MYADOID(0x00000612); -const IID ADOS::IID_ADOVIEW_25 = MYADOID(0x00000613); +const CLSID ADOS::CLSID_ADOVIEW_25 = MYADOID(0x00000612); +const IID ADOS::IID_ADOVIEW_25 = MYADOID(0x00000613); OLEString& ADOS::GetKeyStr() { @@ -91,37 +91,37 @@ sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType) switch (eType) { case adUnsignedSmallInt: - case adSmallInt: nType = DataType::SMALLINT; break; + case adSmallInt: nType = DataType::SMALLINT; break; case adUnsignedInt: - case adInteger: nType = DataType::INTEGER; break; + case adInteger: nType = DataType::INTEGER; break; case adUnsignedBigInt: - case adBigInt: nType = DataType::BIGINT; break; - case adSingle: nType = DataType::FLOAT; break; - case adDouble: nType = DataType::DOUBLE; break; - case adCurrency: nType = DataType::DOUBLE; break; + case adBigInt: nType = DataType::BIGINT; break; + case adSingle: nType = DataType::FLOAT; break; + case adDouble: nType = DataType::DOUBLE; break; + case adCurrency: nType = DataType::DOUBLE; break; case adVarNumeric: - case adNumeric: nType = DataType::NUMERIC; break; - case adDecimal: nType = DataType::DECIMAL; break; - case adDBDate: nType = DataType::DATE; break; - case adDBTime: nType = DataType::TIME; break; + case adNumeric: nType = DataType::NUMERIC; break; + case adDecimal: nType = DataType::DECIMAL; break; + case adDBDate: nType = DataType::DATE; break; + case adDBTime: nType = DataType::TIME; break; case adDate: - case adDBTimeStamp: nType = DataType::TIMESTAMP; break; - case adBoolean: nType = DataType::BIT; break; -// case adArray: nType = DataType::ARRAY; break; - case adBinary: nType = DataType::BINARY; break; - case adGUID: nType = DataType::OBJECT; break; + case adDBTimeStamp: nType = DataType::TIMESTAMP; break; + case adBoolean: nType = DataType::BIT; break; +// case adArray: nType = DataType::ARRAY; break; + case adBinary: nType = DataType::BINARY; break; + case adGUID: nType = DataType::OBJECT; break; case adBSTR: case adVarWChar: case adWChar: - case adVarChar: nType = DataType::VARCHAR; break; + case adVarChar: nType = DataType::VARCHAR; break; case adLongVarWChar: - case adLongVarChar: nType = DataType::LONGVARCHAR; break; - case adVarBinary: nType = DataType::VARBINARY; break; - case adLongVarBinary: nType = DataType::LONGVARBINARY;break; - case adChar: nType = DataType::CHAR; break; + case adLongVarChar: nType = DataType::LONGVARCHAR; break; + case adVarBinary: nType = DataType::VARBINARY; break; + case adLongVarBinary: nType = DataType::LONGVARBINARY;break; + case adChar: nType = DataType::CHAR; break; case adUnsignedTinyInt: - case adTinyInt: nType = DataType::TINYINT; break; - case adEmpty: nType = DataType::SQLNULL; break; + case adTinyInt: nType = DataType::TINYINT; break; + case adEmpty: nType = DataType::SQLNULL; break; case adUserDefined: case adPropVariant: case adFileTime: @@ -130,7 +130,7 @@ sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType) case adIUnknown: case adError: case adVariant: - nType = DataType::OTHER; break; + nType = DataType::OTHER; break; default: OSL_ENSURE(0,"MapADOType2Jdbc: Unknown Type!"); ; @@ -142,27 +142,27 @@ DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine) { switch (_nType) { - case DataType::SMALLINT: return adSmallInt; break; - case DataType::INTEGER: return adInteger; break; - case DataType::BIGINT: return adBigInt; break; - case DataType::FLOAT: return adSingle; break; - case DataType::DOUBLE: return adDouble; break; - case DataType::NUMERIC: return adNumeric; break; - case DataType::DECIMAL: return adDecimal; break; - case DataType::DATE: return isJetEngine(_nJetEngine) ? adDate : adDBDate; break; - case DataType::TIME: return adDBTime; break; - case DataType::TIMESTAMP: return isJetEngine(_nJetEngine) ? adDate : adDBTimeStamp; break; - case DataType::BIT: return adBoolean; break; - case DataType::BINARY: return adBinary; break; - case DataType::VARCHAR: return adVarWChar; break; + case DataType::SMALLINT: return adSmallInt; break; + case DataType::INTEGER: return adInteger; break; + case DataType::BIGINT: return adBigInt; break; + case DataType::FLOAT: return adSingle; break; + case DataType::DOUBLE: return adDouble; break; + case DataType::NUMERIC: return adNumeric; break; + case DataType::DECIMAL: return adDecimal; break; + case DataType::DATE: return isJetEngine(_nJetEngine) ? adDate : adDBDate; break; + case DataType::TIME: return adDBTime; break; + case DataType::TIMESTAMP: return isJetEngine(_nJetEngine) ? adDate : adDBTimeStamp; break; + case DataType::BIT: return adBoolean; break; + case DataType::BINARY: return adBinary; break; + case DataType::VARCHAR: return adVarWChar; break; case DataType::CLOB: - case DataType::LONGVARCHAR: return adLongVarWChar; break; - case DataType::VARBINARY: return adVarBinary; break; + case DataType::LONGVARCHAR: return adLongVarWChar; break; + case DataType::VARBINARY: return adVarBinary; break; case DataType::BLOB: - case DataType::LONGVARBINARY: return adLongVarBinary; break; - case DataType::CHAR: return adWChar; break; - case DataType::TINYINT: return isJetEngine(_nJetEngine) ? adUnsignedTinyInt : adTinyInt;break; - case DataType::OBJECT: return adGUID; break; + case DataType::LONGVARBINARY: return adLongVarBinary; break; + case DataType::CHAR: return adWChar; break; + case DataType::TINYINT: return isJetEngine(_nJetEngine) ? adUnsignedTinyInt : adTinyInt;break; + case DataType::OBJECT: return adGUID; break; default: OSL_ENSURE(0,"MapJdbc2ADOType: Unknown Type!"); ; @@ -170,30 +170,30 @@ DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine) return adEmpty; } // ----------------------------------------------------------------------------- -const int JET_ENGINETYPE_UNKNOWN = 0; -const int JET_ENGINETYPE_JET10 = 1; -const int JET_ENGINETYPE_JET11 = 2; -const int JET_ENGINETYPE_JET20 = 3; -const int JET_ENGINETYPE_JET3X = 4; -const int JET_ENGINETYPE_JET4X = 5; -const int JET_ENGINETYPE_DBASE3 = 10; -const int JET_ENGINETYPE_DBASE4 = 11; -const int JET_ENGINETYPE_DBASE5 = 12; -const int JET_ENGINETYPE_EXCEL30 = 20; -const int JET_ENGINETYPE_EXCEL40 = 21; -const int JET_ENGINETYPE_EXCEL50 = 22; -const int JET_ENGINETYPE_EXCEL80 = 23; -const int JET_ENGINETYPE_EXCEL90 = 24; -const int JET_ENGINETYPE_EXCHANGE4 = 30; -const int JET_ENGINETYPE_LOTUSWK1 = 40; -const int JET_ENGINETYPE_LOTUSWK3 = 41; -const int JET_ENGINETYPE_LOTUSWK4 = 42; -const int JET_ENGINETYPE_PARADOX3X = 50; -const int JET_ENGINETYPE_PARADOX4X = 51; -const int JET_ENGINETYPE_PARADOX5X = 52; -const int JET_ENGINETYPE_PARADOX7X = 53; -const int JET_ENGINETYPE_TEXT1X = 60; -const int JET_ENGINETYPE_HTML1X = 70; +const int JET_ENGINETYPE_UNKNOWN = 0; +const int JET_ENGINETYPE_JET10 = 1; +const int JET_ENGINETYPE_JET11 = 2; +const int JET_ENGINETYPE_JET20 = 3; +const int JET_ENGINETYPE_JET3X = 4; +const int JET_ENGINETYPE_JET4X = 5; +const int JET_ENGINETYPE_DBASE3 = 10; +const int JET_ENGINETYPE_DBASE4 = 11; +const int JET_ENGINETYPE_DBASE5 = 12; +const int JET_ENGINETYPE_EXCEL30 = 20; +const int JET_ENGINETYPE_EXCEL40 = 21; +const int JET_ENGINETYPE_EXCEL50 = 22; +const int JET_ENGINETYPE_EXCEL80 = 23; +const int JET_ENGINETYPE_EXCEL90 = 24; +const int JET_ENGINETYPE_EXCHANGE4 = 30; +const int JET_ENGINETYPE_LOTUSWK1 = 40; +const int JET_ENGINETYPE_LOTUSWK3 = 41; +const int JET_ENGINETYPE_LOTUSWK4 = 42; +const int JET_ENGINETYPE_PARADOX3X = 50; +const int JET_ENGINETYPE_PARADOX4X = 51; +const int JET_ENGINETYPE_PARADOX5X = 52; +const int JET_ENGINETYPE_PARADOX7X = 53; +const int JET_ENGINETYPE_TEXT1X = 60; +const int JET_ENGINETYPE_HTML1X = 70; sal_Bool ADOS::isJetEngine(sal_Int32 _nEngineType) { @@ -320,9 +320,9 @@ WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) thr if ( !_pRecordSet ) return WpADOField(); - ADOFields* pFields = NULL; + ADOFields* pFields = NULL; _pRecordSet->get_Fields(&pFields); - WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); + WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); if(_nColumnIndex <= 0 || _nColumnIndex > aFields.GetItemCount()) ::dbtools::throwInvalidIndexException(NULL); WpADOField aField(aFields.GetItem(_nColumnIndex-1)); diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx index fd0f903b5705..43142bc18e08 100644 --- a/connectivity/source/drivers/calc/CCatalog.cxx +++ b/connectivity/source/drivers/calc/CCatalog.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 @@ -73,7 +73,7 @@ void OCalcCatalog::refreshTables() // this avoids that the document will be loaded a 2nd time when one table will be accessed. //if ( m_pTables && m_pTables->hasElements() ) - // m_pTables->getByIndex(0); + // m_pTables->getByIndex(0); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx index 019361e3d12f..e3d7bcaa44a3 100644 --- a/connectivity/source/drivers/calc/CColumns.cxx +++ b/connectivity/source/drivers/calc/CColumns.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/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 7056a07e7488..bbe3990afb69 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.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 @@ -76,7 +76,7 @@ void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< Prope throw(SQLException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::construct" ); - // open file + // open file sal_Int32 nLen = url.indexOf(':'); nLen = url.indexOf(':',nLen+1); @@ -92,16 +92,16 @@ void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< Prope aURL.SetSmartURL(m_aFileName); if ( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { - // don't pass invalid URL to loadComponentFromURL + // don't pass invalid URL to loadComponentFromURL throw SQLException(); } m_aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE); m_sPassword = ::rtl::OUString(); - const char* pPwd = "password"; + const char* pPwd = "password"; - const PropertyValue *pIter = info.getConstArray(); - const PropertyValue *pEnd = pIter + info.getLength(); + const PropertyValue *pIter = info.getConstArray(); + const PropertyValue *pEnd = pIter + info.getLength(); for(;pIter != pEnd;++pIter) { if(!pIter->Name.compareToAscii(pPwd)) @@ -122,7 +122,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc() osl_incrementInterlockedCount(&m_nDocCount); return m_xDoc; } - // open read-only as long as updating isn't implemented + // open read-only as long as updating isn't implemented Sequence<PropertyValue> aArgs(2); aArgs[0].Name = ::rtl::OUString::createFromAscii("Hidden"); aArgs[0].Value <<= (sal_Bool) sal_True; @@ -158,8 +158,8 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc() m_xDoc.set(xComponent, UNO_QUERY ); - // if the URL is not a spreadsheet document, throw the exception here - // instead of at the first access to it + // if the URL is not a spreadsheet document, throw the exception here + // instead of at the first access to it if ( !m_xDoc.is() ) { Any aErrorDetails; diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 272ef85822cf..80f22f5f59ce 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.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 @@ -63,7 +63,7 @@ using namespace ::com::sun::star::sheet; // ------------------------------------------------------------------------- -OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon) :ODatabaseMetaData(_pCon) +OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon) :ODatabaseMetaData(_pCon) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::OCalcDatabaseMetaData" ); } @@ -178,8 +178,8 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( aRow[10] = new ORowSetValueDecorator((sal_Int32)10); Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames()); - const ::rtl::OUString* pTabIter = aTabNames.getConstArray(); - const ::rtl::OUString* pTabEnd = pTabIter + aTabNames.getLength(); + const ::rtl::OUString* pTabIter = aTabNames.getConstArray(); + const ::rtl::OUString* pTabEnd = pTabIter + aTabNames.getLength(); for(;pTabIter != pTabEnd;++pTabIter) { if(match(tableNamePattern,*pTabIter,'\0')) @@ -208,13 +208,13 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( aRow[5] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))); aRow[6] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))); aRow[7] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))); - // aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + // aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); aRow[9] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))); aRow[11] = new ORowSetValueDecorator(::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))); - // aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + // aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); aRow[13] = new ORowSetValueDecorator(::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)))); - // aRow[14] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); - // aRow[15] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + // aRow[14] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); + // aRow[15] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)); switch(sal_Int32(aRow[5]->getValue())) { case DataType::CHAR: @@ -304,7 +304,7 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r Reference<XSpreadsheet> xSheet; if ( aAny >>= xSheet ) { - // test if sheet is hidden + // test if sheet is hidden Reference<XPropertySet> xProp( xSheet, UNO_QUERY ); if (xProp.is()) @@ -313,23 +313,23 @@ sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::r Any aVisAny = xProp->getPropertyValue( ::rtl::OUString::createFromAscii("IsVisible") ); if ( aVisAny >>= bVisible ) if (!bVisible) - return sal_True; // hidden - } + return sal_True; // hidden + } - // use the same data area as in OCalcTable to test for empty table + // use the same data area as in OCalcTable to test for empty table Reference<XSheetCellCursor> xCursor = xSheet->createCursor(); Reference<XCellRangeAddressable> xRange( xCursor, UNO_QUERY ); if ( xRange.is() ) { - xCursor->collapseToSize( 1, 1 ); // single (first) cell - xCursor->collapseToCurrentRegion(); // contiguous data area + xCursor->collapseToSize( 1, 1 ); // single (first) cell + xCursor->collapseToCurrentRegion(); // contiguous data area CellRangeAddress aRangeAddr = xRange->getRangeAddress(); if ( aRangeAddr.StartColumn == aRangeAddr.EndColumn && aRangeAddr.StartRow == aRangeAddr.EndRow ) { - // single cell -> check content + // single cell -> check content Reference<XCell> xCell = xCursor->getCellByPosition( 0, 0 ); if ( xCell.is() && xCell->getType() == CellContentType_EMPTY ) return sal_True; @@ -361,7 +361,7 @@ sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl:: catch ( UnknownPropertyException& ) { // optional property - } + } } } @@ -391,9 +391,9 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( if(nLength) { bTableFound = sal_False; - + const ::rtl::OUString* pIter = types.getConstArray(); - const ::rtl::OUString* pEnd = pIter + nLength; + const ::rtl::OUString* pEnd = pIter + nLength; for(;pIter != pEnd;++pIter) { if(*pIter == aTable) diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index 5861836e322e..4f3cb57ef483 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.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/source/drivers/calc/CPreparedStatement.cxx b/connectivity/source/drivers/calc/CPreparedStatement.cxx index b80353dc151a..13487b50678d 100644 --- a/connectivity/source/drivers/calc/CPreparedStatement.cxx +++ b/connectivity/source/drivers/calc/CPreparedStatement.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/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index 3b73d3d02c7c..e218ce7f0041 100644 --- a/connectivity/source/drivers/calc/CResultSet.cxx +++ b/connectivity/source/drivers/calc/CResultSet.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 @@ -44,10 +44,10 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// using namespace com::sun::star::container; -// using namespace com::sun::star::util; +// using namespace com::sun::star::container; +// using namespace com::sun::star::util; //------------------------------------------------------------------------------ -OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) +OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) : file::OResultSet(pStmt,_aSQLIterator) ,m_bBookmarkable(sal_True) { @@ -55,20 +55,20 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException) -{ - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.calc.ResultSet"); +{ + return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.calc.ResultSet"); } -// ------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException) -{ - Sequence< ::rtl::OUString > aSupported(2); +// ------------------------------------------------------------------------- +Sequence< ::rtl::OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException) +{ + Sequence< ::rtl::OUString > aSupported(2); aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet"); aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet"); - return aSupported; + return aSupported; } -// ------------------------------------------------------------------------- -sal_Bool SAL_CALL OCalcResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) -{ +// ------------------------------------------------------------------------- +sal_Bool SAL_CALL OCalcResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException) +{ Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); const ::rtl::OUString* pSupported = aSupported.getConstArray(); const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); @@ -76,7 +76,7 @@ sal_Bool SAL_CALL OCalcResultSet::supportsService( const ::rtl::OUString& _rServ ; return pSupported != pEnd; -} +} // ------------------------------------------------------------------------- Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType ) throw(RuntimeException) { @@ -95,7 +95,7 @@ Any SAL_CALL OCalcResultSet::getBookmark( ) throw( SQLException, RuntimeExcept { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } @@ -104,7 +104,7 @@ sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) throw( { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False; @@ -115,7 +115,7 @@ sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False; @@ -139,7 +139,7 @@ sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) throw( S { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + return comphelper::getINT32(bookmark); } @@ -149,14 +149,14 @@ Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const Sequence< Any { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + ::dbtools::throwFeatureNotImplementedException( "XDeleteRows::deleteRows", *this ); return Sequence< sal_Int32 >(); } // ------------------------------------------------------------------------- sal_Bool OCalcResultSet::fillIndexValues(const Reference< XColumnsSupplier> &/*_xIndex*/) { - // Calc table has no index + // Calc table has no index return sal_False; } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/calc/CStatement.cxx b/connectivity/source/drivers/calc/CStatement.cxx index 1005d0c8af90..9bdc780c8296 100644 --- a/connectivity/source/drivers/calc/CStatement.cxx +++ b/connectivity/source/drivers/calc/CStatement.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/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 018eb4d2dfaa..5a005d22d321 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.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 @@ -81,7 +81,7 @@ using namespace ::com::sun::star::util; void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_UpdateArea" ); - // update rEndCol, rEndRow if any non-empty cell in xUsedRange is right/below + // update rEndCol, rEndRow if any non-empty cell in xUsedRange is right/below const Reference<XCellRangesQuery> xUsedQuery( xUsedRange, UNO_QUERY ); if ( xUsedQuery.is() ) @@ -115,8 +115,8 @@ void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnC // first find the contiguous cell area starting at A1 - xCursor->collapseToSize( 1, 1 ); // single (first) cell - xCursor->collapseToCurrentRegion(); // contiguous data area + xCursor->collapseToSize( 1, 1 ); // single (first) cell + xCursor->collapseToCurrentRegion(); // contiguous data area CellRangeAddress aRegionAddr = xRange->getRangeAddress(); sal_Int32 nEndCol = aRegionAddr.EndColumn; @@ -125,9 +125,9 @@ void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnC Reference<XUsedAreaCursor> xUsed( xCursor, UNO_QUERY ); if ( xUsed.is() ) { - // The used area from XUsedAreaCursor includes visible attributes. - // If the used area is larger than the contiguous cell area, find non-empty - // cells in that area. + // The used area from XUsedAreaCursor includes visible attributes. + // If the used area is larger than the contiguous cell area, find non-empty + // cells in that area. xUsed->gotoEndOfUsedArea( sal_False ); CellRangeAddress aUsedAddr = xRange->getRangeAddress(); @@ -141,15 +141,15 @@ void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnC if ( aUsedAddr.EndRow > aRegionAddr.EndRow ) { - // only up to the last column of aRegionAddr, the other columns are handled above + // only up to the last column of aRegionAddr, the other columns are handled above Reference<XCellRange> xUsedRange = xSheet->getCellRangeByPosition( 0, aRegionAddr.EndRow + 1, aRegionAddr.EndColumn, aUsedAddr.EndRow ); lcl_UpdateArea( xUsedRange, nEndCol, nEndRow ); } } - rColumnCount = nEndCol + 1; // number of columns - rRowCount = nEndRow; // first row (headers) is not counted + rColumnCount = nEndCol + 1; // number of columns + rRowCount = nEndRow; // first row (headers) is not counted } CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell ) @@ -162,11 +162,11 @@ CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell ) Reference<XPropertySet> xProp( xCell, UNO_QUERY ); try { - xProp->getPropertyValue( s_sFormulaResultType ) >>= eCellType; // type of formula result + xProp->getPropertyValue( s_sFormulaResultType ) >>= eCellType; // type of formula result } catch (UnknownPropertyException&) { - eCellType = CellContentType_VALUE; // if FormulaResultType property not available + eCellType = CellContentType_VALUE; // if FormulaResultType property not available } } return eCellType; @@ -178,7 +178,7 @@ Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet, sal_Int Reference<XCell> xCell = xSheet->getCellByPosition( nDocColumn, nDocRow ); if ( xCell.is() && xCell->getType() == CellContentType_EMPTY ) { - // get first non-empty cell + // get first non-empty cell Reference<XCellRangeAddressable> xAddr( xSheet, UNO_QUERY ); if (xAddr.is()) @@ -243,9 +243,9 @@ void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<X ::rtl::OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetColumnInfo" ); - //! avoid duplicate field names + //! avoid duplicate field names - // get column name from first row, if range contains headers + // get column name from first row, if range contains headers if ( bHasHeaders ) { @@ -264,7 +264,7 @@ void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<X Reference<XPropertySet> xProp( xDataCell, UNO_QUERY ); if ( xProp.is() ) { - rCurrency = sal_False; // set to true for currency below + rCurrency = sal_False; // set to true for currency below const CellContentType eCellType = lcl_GetContentOrResultType( xDataCell ); // #i35178# use "text" type if there is any text cell in the column @@ -272,14 +272,14 @@ void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<X rDataType = DataType::VARCHAR; else if ( eCellType == CellContentType_VALUE ) { - // get number format to distinguish between different types + // get number format to distinguish between different types sal_Int16 nNumType = NumberFormat::NUMBER; try { static ::rtl::OUString s_NumberFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat")); sal_Int32 nKey = 0; - + if ( xProp->getPropertyValue( s_NumberFormat ) >>= nKey ) { const Reference<XPropertySet> xFormat = xFormats->getByKey( nKey ); @@ -304,7 +304,7 @@ void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<X } else if ( ( nNumType & NumberFormat::DATETIME ) == NumberFormat::DATETIME ) { - // NumberFormat::DATETIME is DATE | TIME + // NumberFormat::DATETIME is DATE | TIME rDataType = DataType::TIMESTAMP; } else if ( nNumType & NumberFormat::DATE ) @@ -318,7 +318,7 @@ void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<X } else { - // whole column empty + // whole column empty rDataType = DataType::VARCHAR; } } @@ -332,7 +332,7 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, sal_Int32 nDBRow, sal_Int32 nDBColumn, sal_Int32 nType ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_SetValue" ); - sal_Int32 nDocColumn = nStartCol + nDBColumn - 1; // database counts from 1 + sal_Int32 nDocColumn = nStartCol + nDBColumn - 1; // database counts from 1 sal_Int32 nDocRow = nStartRow + nDBRow - 1; if (bHasHeaders) ++nDocRow; @@ -356,7 +356,7 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, break; case DataType::DECIMAL: if ( eCellType == CellContentType_VALUE ) - rValue = xCell->getValue(); // double + rValue = xCell->getValue(); // double else rValue.setNull(); break; @@ -384,7 +384,7 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, double fTime = fCellVal - rtl::math::approxFloor( fCellVal ); long nIntTime = (long)rtl::math::round( fTime * 8640000.0 ); if ( nIntTime == 8640000 ) - nIntTime = 0; // 23:59:59.995 and above is 00:00:00.00 + nIntTime = 0; // 23:59:59.995 and above is 00:00:00.00 ::com::sun::star::util::Time aTime; aTime.HundredthSeconds = (sal_uInt16)( nIntTime % 100 ); nIntTime /= 100; @@ -409,8 +409,8 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, long nIntTime = (long)::rtl::math::round( fTime * 8640000.0 ); if ( nIntTime == 8640000 ) { - nIntTime = 0; // 23:59:59.995 and above is 00:00:00.00 - ++nIntDays; // (next day) + nIntTime = 0; // 23:59:59.995 and above is 00:00:00.00 + ++nIntDays; // (next day) } ::com::sun::star::util::DateTime aDateTime; @@ -438,7 +438,7 @@ void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet, } // switch (nType) } -// rValue.setTypeKind(nType); +// rValue.setTypeKind(nType); } // ------------------------------------------------------------------------- @@ -482,8 +482,8 @@ void OCalcTable::fillColumns() if ( !aColumnName.getLength() ) aColumnName = lcl_GetColumnStr( i ); - sal_Int32 nPrecision = 0; //! ... - sal_Int32 nDecimals = 0; //! ... + sal_Int32 nPrecision = 0; //! ... + sal_Int32 nDecimals = 0; //! ... switch ( eType ) { @@ -560,7 +560,7 @@ OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnectio void OCalcTable::construct() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::construct" ); - // get sheet object + // get sheet object Reference< XSpreadsheetDocument> xDoc = m_pConnection->acquireDoc(); if (xDoc.is()) { @@ -575,21 +575,21 @@ void OCalcTable::construct() // whole sheet is always assumed to include a header row } } - else // no sheet -> try database range + else // no sheet -> try database range { Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY ); if ( xDocProp.is() ) { Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DatabaseRanges")) ),UNO_QUERY); - + if ( xRanges.is() && xRanges->hasByName( m_Name ) ) { Reference<XDatabaseRange> xDBRange(xRanges->getByName( m_Name ),UNO_QUERY); Reference<XCellRangeReferrer> xRefer( xDBRange, UNO_QUERY ); if ( xRefer.is() ) { - // Header flag is always stored with database range - // Get flag from FilterDescriptor + // Header flag is always stored with database range + // Get flag from FilterDescriptor sal_Bool bRangeHeader = sal_True; Reference<XPropertySet> xFiltProp( xDBRange->getFilterDescriptor(), UNO_QUERY ); @@ -605,11 +605,11 @@ void OCalcTable::construct() m_nStartCol = aRangeAddr.StartColumn; m_nStartRow = aRangeAddr.StartRow; m_nDataCols = aRangeAddr.EndColumn - m_nStartCol + 1; - // m_nDataRows is excluding header row + // m_nDataRows is excluding header row m_nDataRows = aRangeAddr.EndRow - m_nStartRow; if ( !bRangeHeader ) { - // m_nDataRows counts the whole range + // m_nDataRows counts the whole range m_nDataRows += 1; } @@ -633,7 +633,7 @@ void OCalcTable::construct() } } - //! default if no null date available? + //! default if no null date available? fillColumns(); @@ -654,13 +654,13 @@ void OCalcTable::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new OCalcColumns(this,m_aMutex,aVector); + m_pColumns = new OCalcColumns(this,m_aMutex,aVector); } // ------------------------------------------------------------------------- void OCalcTable::refreshIndexes() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::refreshIndexes" ); - // Calc table has no index + // Calc table has no index } // ------------------------------------------------------------------------- @@ -673,7 +673,7 @@ void SAL_CALL OCalcTable::disposing(void) if ( m_pConnection ) m_pConnection->releaseDoc(); m_pConnection = NULL; - + } // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException) @@ -681,13 +681,13 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException) //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::getTypes" ); Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); ::std::vector<Type> aOwnTypes; - aOwnTypes.reserve(aTypes.getLength()); + aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) { - if(!( *pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) || + if(!( *pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) || *pBegin == ::getCppuType((const Reference<XIndexesSupplier>*)0) || *pBegin == ::getCppuType((const Reference<XRename>*)0) || *pBegin == ::getCppuType((const Reference<XAlterTable>*)0) || @@ -736,7 +736,7 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId() sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::getSomething" ); - return (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) + return (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) : OCalcTable_BASE::getSomething(rId); } @@ -789,7 +789,7 @@ sal_Bool OCalcTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int goto Error; else { - //! read buffer / setup row object etc? + //! read buffer / setup row object etc? } goto End; @@ -810,9 +810,9 @@ Error: m_nFilePos = 0; break; case IResultSetHelper::BOOKMARK: - m_nFilePos = nTempPos; // vorherige Position + m_nFilePos = nTempPos; // vorherige Position } - // aStatus.Set(SDB_STAT_NO_DATA_FOUND); + // aStatus.Set(SDB_STAT_NO_DATA_FOUND); return sal_False; End: @@ -849,8 +849,8 @@ sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols, else (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; - - lcl_SetValue( (_rRow->get())[i]->get(), m_xSheet, m_nStartCol, m_nStartRow, m_bHasHeaders, + + lcl_SetValue( (_rRow->get())[i]->get(), m_xSheet, m_nStartCol, m_nStartRow, m_bHasHeaders, m_aNullDate, m_nFilePos, i, nType ); } } diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx index df39fb7698db..165252345967 100644 --- a/connectivity/source/drivers/calc/CTables.cxx +++ b/connectivity/source/drivers/calc/CTables.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 @@ -46,7 +46,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -namespace starutil = ::com::sun::star::util; +namespace starutil = ::com::sun::star::util; sdbcx::ObjectType OCalcTables::createObject(const ::rtl::OUString& _rName) { diff --git a/connectivity/source/drivers/calc/CalcDriver.xml b/connectivity/source/drivers/calc/CalcDriver.xml index c6ff0d00fe55..31a73e8bdd39 100644 --- a/connectivity/source/drivers/calc/CalcDriver.xml +++ b/connectivity/source/drivers/calc/CalcDriver.xml @@ -12,7 +12,7 @@ <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> <supported-service>com.sun.star.sdbcx.Driver</supported-service> - <service-dependency> ... </service-dependency> + <service-dependency> ... </service-dependency> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index cf99d4b4654e..4af845930d47 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.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 @@ -116,8 +116,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/calc/calc.xcu b/connectivity/source/drivers/calc/calc.xcu index b7b494fdfa56..ec71ed3cafcc 100755 --- a/connectivity/source/drivers/calc/calc.xcu +++ b/connectivity/source/drivers/calc/calc.xcu @@ -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 @@ -40,7 +40,7 @@ <value>true</value> </prop> </node> - </node> + </node> <node oor:name="MetaData"> <node oor:name="SupportsBrowsing" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx index b0007da28a62..56638353437d 100644 --- a/connectivity/source/drivers/dbase/DCatalog.cxx +++ b/connectivity/source/drivers/dbase/DCatalog.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/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx index 3c7edbf4ca55..5ac541416352 100644 --- a/connectivity/source/drivers/dbase/DCode.cxx +++ b/connectivity/source/drivers/dbase/DCode.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 @@ -65,7 +65,7 @@ OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos, Sequence< ::rtl::OUString> aSeq = _xIndexes->getElementNames(); const ::rtl::OUString* pBegin = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aSeq.getLength(); + const ::rtl::OUString* pEnd = pBegin + aSeq.getLength(); for(;pBegin != pEnd;++pBegin) { _xIndexes->getByName(*pBegin) >>= xIndex; diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index c3221c69b04c..6f2fb95d5bfe 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.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/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx index b30eb3cca0c9..e2dc2e30b8ba 100644 --- a/connectivity/source/drivers/dbase/DConnection.cxx +++ b/connectivity/source/drivers/dbase/DConnection.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 @@ -54,7 +54,7 @@ using namespace ::com::sun::star::lang; DBG_NAME(ODbaseConnection) // -------------------------------------------------------------------------------- -ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver) +ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver) { DBG_CTOR(ODbaseConnection,NULL); m_aFilenameExtension = String::CreateFromAscii("dbf"); diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index 74c053b66f8d..85288e86f2f6 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.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 @@ -59,7 +59,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::lang; -ODbaseDatabaseMetaData::ODbaseDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon) +ODbaseDatabaseMetaData::ODbaseDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::ODbaseDatabaseMetaData" ); } @@ -75,7 +75,7 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( ) ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo); Reference< XResultSet > xRef = pResult; - + static ODatabaseMetaDataResultSet::ORows aRows; if(aRows.empty()) { @@ -189,8 +189,8 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( aRow[10] = new ORowSetValueDecorator((sal_Int32)10); Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames()); - const ::rtl::OUString* pTabBegin = aTabNames.getConstArray(); - const ::rtl::OUString* pTabEnd = pTabBegin + aTabNames.getLength(); + const ::rtl::OUString* pTabBegin = aTabNames.getConstArray(); + const ::rtl::OUString* pTabEnd = pTabBegin + aTabNames.getLength(); for(;pTabBegin != pTabEnd;++pTabBegin) { if(match(tableNamePattern,*pTabBegin,'\0')) @@ -277,8 +277,8 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(14); - aRow[5] = new ORowSetValueDecorator(::rtl::OUString()); - aRow[10] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("A")); + aRow[5] = new ORowSetValueDecorator(::rtl::OUString()); + aRow[10] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("A")); Reference< XIndexesSupplier> xTable; ::cppu::extractInterface(xTable,xNames->getByName(table)); @@ -398,7 +398,7 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, Run return bReadOnly; } // ----------------------------------------------------------------------------- -sal_Bool ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +sal_Bool ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw" ); return sal_True; diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index 76c573a509a3..19201664166a 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.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 @@ -115,7 +115,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::O ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")) ,aBoolean) ); - return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); + return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); } SharedResources aResources; diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 1b205f08ef70..09103a277fe7 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.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 @@ -78,7 +78,7 @@ ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getCo construct(); } // ------------------------------------------------------------------------- -ODbaseIndex::ODbaseIndex( ODbaseTable* _pTable, +ODbaseIndex::ODbaseIndex( ODbaseTable* _pTable, const NDXHeader& _rHeader, const ::rtl::OUString& _rName) :OIndex(_rName,::rtl::OUString(),_rHeader.db_unique,sal_False,sal_False,sal_True) @@ -597,7 +597,7 @@ BOOL ODbaseIndex::CreateImpl() nRowsLeft = xSet->getRow(); xSet->beforeFirst(); - ORowSetValue atmpValue=ORowSetValue(); + ORowSetValue atmpValue=ORowSetValue(); ONDXKey aKey(atmpValue, nType, 0); ONDXKey aInsertKey(atmpValue, nType, 0); // Erzeugen der Indexstruktur diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index 3b9d1302e86b..b10780bfc649 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.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/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx index 83297aa4fca5..965196f7ded9 100644 --- a/connectivity/source/drivers/dbase/DIndexIter.cxx +++ b/connectivity/source/drivers/dbase/DIndexIter.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 @@ -102,7 +102,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey) // wird immer die aktuelle Seite und die Knotenposition vermerkt // auf die die Bedingung <= zutrifft // dieses findet beim Insert besondere Beachtung - // ONDXIndex* m_pIndex = GetNDXIndex(); + // ONDXIndex* m_pIndex = GetNDXIndex(); OOp_COMPARE aTempOp(SQLFilterOperator::GREATER); USHORT i = 0; @@ -286,7 +286,7 @@ ONDXKey* OIndexIterator::GetNextKey() { USHORT nPos = pParentPage->Search(pPage); if (nPos != pParentPage->Count() - 1) - { // Seite gefunden + { // Seite gefunden pPage = (*pParentPage)[nPos+1].GetChild(m_pIndex,pParentPage); break; } diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx index 53ba4b50b5d5..cd2090de7f02 100644 --- a/connectivity/source/drivers/dbase/DIndexes.cxx +++ b/connectivity/source/drivers/dbase/DIndexes.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 @@ -48,7 +48,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -namespace starutil = ::com::sun::star::util; +namespace starutil = ::com::sun::star::util; sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName) { diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx index 165fe5be3b6a..55c06f2018c8 100644 --- a/connectivity/source/drivers/dbase/DNoException.cxx +++ b/connectivity/source/drivers/dbase/DNoException.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 @@ -118,7 +118,7 @@ Error: m_nFilePos = 0; break; case IResultSetHelper::BOOKMARK: - m_nFilePos = nTempPos; // vorherige Position + m_nFilePos = nTempPos; // vorherige Position } return sal_False; @@ -140,7 +140,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable) const char cEOF = (char) 0x1a; ByteString aBStr; static char aBuf[514]; - aBuf[512] = 0; // sonst kann der Zufall uebel mitspielen + aBuf[512] = 0; // sonst kann der Zufall uebel mitspielen BOOL bReady = sal_False; do @@ -228,7 +228,7 @@ void ODbaseTable::AllocBuffer() if (m_pBuffer == NULL && nSize) { m_nBufferSize = nSize; - m_pBuffer = new BYTE[m_nBufferSize+1]; + m_pBuffer = new BYTE[m_nBufferSize+1]; } } // ----------------------------------------------------------------------------- @@ -294,7 +294,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const if (!rIndex.isUnique() || rPage.IsLeaf()) rStream << (sal_uInt32)aKey.nRecord; // schluessel else - rStream << (sal_uInt32)0; // schluessel + rStream << (sal_uInt32)0; // schluessel if (rIndex.getHeader().db_keytype) // double { diff --git a/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx index d67b477e3385..67f7c3694142 100644 --- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx +++ b/connectivity/source/drivers/dbase/DPreparedStatement.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/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index c7489929d210..6b93961a5296 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.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 @@ -50,7 +50,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; //------------------------------------------------------------------------------ -ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) +ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) : file::OResultSet(pStmt,_aSQLIterator) ,m_bBookmarkable(sal_True) { diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx index a6038aea6825..9e0e5ddfc8e1 100644 --- a/connectivity/source/drivers/dbase/DStatement.cxx +++ b/connectivity/source/drivers/dbase/DStatement.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/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 8b5a375a28dc..fa286f345679 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.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 @@ -44,7 +44,7 @@ #include <svl/zforlist.hxx> #include <unotools/syslocale.hxx> #include <rtl/math.hxx> -#include <stdio.h> //sprintf +#include <stdio.h> //sprintf #include <ucbhelper/content.hxx> #include <comphelper/extract.hxx> #include <connectivity/dbexception.hxx> @@ -86,7 +86,7 @@ using namespace ::com::sun::star::i18n; #define FIELD_DESCRIPTOR_TERMINATOR 0x0D #define DBF_EOL 0x1A -namespace +namespace { sal_Int32 lcl_getFileSize(SvStream& _rStream) { @@ -106,7 +106,7 @@ sal_Int32 lcl_getFileSize(SvStream& _rStream) void lcl_CalcJulDate(sal_Int32& _nJulianDate,sal_Int32& _nJulianTime,const com::sun::star::util::DateTime _aDateTime) { com::sun::star::util::DateTime aDateTime = _aDateTime; - // weird: months fix + // weird: months fix if (aDateTime.Month > 12) { aDateTime.Month--; @@ -132,23 +132,23 @@ void lcl_CalcJulDate(sal_Int32& _nJulianDate,sal_Int32& _nJulianTime,const com:: } sal_Int32 ia = iy0 / 100; sal_Int32 ib = 2 - ia + (ia >> 2); - /* calculate julian date */ - if ( aDateTime.Year <= 0 ) + /* calculate julian date */ + if ( aDateTime.Year <= 0 ) { _nJulianDate = (sal_Int32) ((365.25 * iy0) - 0.75) + (sal_Int32) (30.6001 * (im0 + 1) ) + aDateTime.Day + 1720994; - } // if ( _aDateTime.Year <= 0 ) - else + } // if ( _aDateTime.Year <= 0 ) + else { - _nJulianDate = static_cast<sal_Int32>( ((365.25 * iy0) + _nJulianDate = static_cast<sal_Int32>( ((365.25 * iy0) + (sal_Int32) (30.6001 * (im0 + 1)) + aDateTime.Day + 1720994)); } double JD = _nJulianDate + 0.5; _nJulianDate = (sal_Int32)( JD + 0.5); const double gyr = aDateTime.Year + (0.01 * aDateTime.Month) + (0.0001 * aDateTime.Day); - if ( gyr >= 1582.1015 ) /* on or after 15 October 1582 */ + if ( gyr >= 1582.1015 ) /* on or after 15 October 1582 */ _nJulianDate += ib; } @@ -251,30 +251,30 @@ void ODbaseTable::readHeader() case dBaseIIIMemo: case FoxProMemo: m_pFileStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); - if ( m_aHeader.db_frei[17] != 0x00 + if ( m_aHeader.db_frei[17] != 0x00 && !m_aHeader.db_frei[18] && !m_aHeader.db_frei[19] && getConnection()->isTextEncodingDefaulted() ) { switch(m_aHeader.db_frei[17]) { - case 0x01: m_eEncoding = RTL_TEXTENCODING_IBM_437; break; // DOS USA code page 437 - case 0x02: m_eEncoding = RTL_TEXTENCODING_IBM_850; break; // DOS Multilingual code page 850 - case 0x03: m_eEncoding = RTL_TEXTENCODING_MS_1252; break; // Windows ANSI code page 1252 - case 0x04: m_eEncoding = RTL_TEXTENCODING_APPLE_ROMAN; break; // Standard Macintosh - case 0x64: m_eEncoding = RTL_TEXTENCODING_IBM_852; break; // EE MS-DOS code page 852 - case 0x65: m_eEncoding = RTL_TEXTENCODING_IBM_865; break; // Nordic MS-DOS code page 865 - case 0x66: m_eEncoding = RTL_TEXTENCODING_IBM_866; break; // Russian MS-DOS code page 866 - case 0x67: m_eEncoding = RTL_TEXTENCODING_IBM_861; break; // Icelandic MS-DOS - //case 0x68: m_eEncoding = ; break; // Kamenicky (Czech) MS-DOS - //case 0x69: m_eEncoding = ; break; // Mazovia (Polish) MS-DOS - case 0x6A: m_eEncoding = RTL_TEXTENCODING_IBM_737; break; // Greek MS-DOS (437G) - case 0x6B: m_eEncoding = RTL_TEXTENCODING_IBM_857; break; // Turkish MS-DOS - case 0x96: m_eEncoding = RTL_TEXTENCODING_APPLE_CYRILLIC; break; // Russian Macintosh - case 0x97: m_eEncoding = RTL_TEXTENCODING_APPLE_CENTEURO; break; // Eastern European Macintosh - case 0x98: m_eEncoding = RTL_TEXTENCODING_APPLE_GREEK; break; // Greek Macintosh - case 0xC8: m_eEncoding = RTL_TEXTENCODING_MS_1250; break; // Windows EE code page 1250 - case 0xC9: m_eEncoding = RTL_TEXTENCODING_MS_1251; break; // Russian Windows - case 0xCA: m_eEncoding = RTL_TEXTENCODING_MS_1254; break; // Turkish Windows - case 0xCB: m_eEncoding = RTL_TEXTENCODING_MS_1253; break; // Greek Windows + case 0x01: m_eEncoding = RTL_TEXTENCODING_IBM_437; break; // DOS USA code page 437 + case 0x02: m_eEncoding = RTL_TEXTENCODING_IBM_850; break; // DOS Multilingual code page 850 + case 0x03: m_eEncoding = RTL_TEXTENCODING_MS_1252; break; // Windows ANSI code page 1252 + case 0x04: m_eEncoding = RTL_TEXTENCODING_APPLE_ROMAN; break; // Standard Macintosh + case 0x64: m_eEncoding = RTL_TEXTENCODING_IBM_852; break; // EE MS-DOS code page 852 + case 0x65: m_eEncoding = RTL_TEXTENCODING_IBM_865; break; // Nordic MS-DOS code page 865 + case 0x66: m_eEncoding = RTL_TEXTENCODING_IBM_866; break; // Russian MS-DOS code page 866 + case 0x67: m_eEncoding = RTL_TEXTENCODING_IBM_861; break; // Icelandic MS-DOS + //case 0x68: m_eEncoding = ; break; // Kamenicky (Czech) MS-DOS + //case 0x69: m_eEncoding = ; break; // Mazovia (Polish) MS-DOS + case 0x6A: m_eEncoding = RTL_TEXTENCODING_IBM_737; break; // Greek MS-DOS (437G) + case 0x6B: m_eEncoding = RTL_TEXTENCODING_IBM_857; break; // Turkish MS-DOS + case 0x96: m_eEncoding = RTL_TEXTENCODING_APPLE_CYRILLIC; break; // Russian Macintosh + case 0x97: m_eEncoding = RTL_TEXTENCODING_APPLE_CENTEURO; break; // Eastern European Macintosh + case 0x98: m_eEncoding = RTL_TEXTENCODING_APPLE_GREEK; break; // Greek Macintosh + case 0xC8: m_eEncoding = RTL_TEXTENCODING_MS_1250; break; // Windows EE code page 1250 + case 0xC9: m_eEncoding = RTL_TEXTENCODING_MS_1251; break; // Russian Windows + case 0xCA: m_eEncoding = RTL_TEXTENCODING_MS_1254; break; // Turkish Windows + case 0xCB: m_eEncoding = RTL_TEXTENCODING_MS_1253; break; // Greek Windows default: break; } @@ -337,7 +337,7 @@ void ODbaseTable::fillColumns() sal_Int32 nPrecision = aDBFColumn.db_flng; sal_Int32 eType; sal_Bool bIsCurrency = sal_False; - + char cType[2]; cType[0] = aDBFColumn.db_typ; cType[1] = 0; @@ -447,10 +447,10 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables,ODbaseConnection* _pConnec { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ODbaseTable" ); // initialize the header - m_aHeader.db_typ = dBaseIII; - m_aHeader.db_anz = 0; - m_aHeader.db_kopf = 0; - m_aHeader.db_slng = 0; + m_aHeader.db_typ = dBaseIII; + m_aHeader.db_anz = 0; + m_aHeader.db_kopf = 0; + m_aHeader.db_slng = 0; m_eEncoding = getConnection()->getTextEncoding(); } // ------------------------------------------------------------------------- @@ -477,10 +477,10 @@ void ODbaseTable::construct() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::construct" ); // initialize the header - m_aHeader.db_typ = dBaseIII; - m_aHeader.db_anz = 0; - m_aHeader.db_kopf = 0; - m_aHeader.db_slng = 0; + m_aHeader.db_typ = dBaseIII; + m_aHeader.db_anz = 0; + m_aHeader.db_kopf = 0; + m_aHeader.db_slng = 0; m_aMemoHeader.db_size = 0; String sFileName(getEntry(m_pConnection,m_Name)); @@ -560,7 +560,7 @@ BOOL ODbaseTable::ReadMemoHeader() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemoHeader" ); m_pMemoStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN); - m_pMemoStream->RefreshBuffer(); // sicherstellen das die Kopfinformationen tatsaechlich neu gelesen werden + m_pMemoStream->RefreshBuffer(); // sicherstellen das die Kopfinformationen tatsaechlich neu gelesen werden m_pMemoStream->Seek(0L); (*m_pMemoStream) >> m_aMemoHeader.db_next; @@ -571,7 +571,7 @@ BOOL ODbaseTable::ReadMemoHeader() // manchmal wird aber auch dBase3 dBase4 Memo zugeordnet m_pMemoStream->Seek(20L); (*m_pMemoStream) >> m_aMemoHeader.db_size; - if (m_aMemoHeader.db_size > 1 && m_aMemoHeader.db_size != 512) // 1 steht auch fuer dBase 3 + if (m_aMemoHeader.db_size > 1 && m_aMemoHeader.db_size != 512) // 1 steht auch fuer dBase 3 m_aMemoHeader.db_typ = MemodBaseIV; else if (m_aMemoHeader.db_size > 1 && m_aMemoHeader.db_size == 512) { @@ -595,7 +595,7 @@ BOOL ODbaseTable::ReadMemoHeader() case VisualFoxPro: case VisualFoxProAuto: case FoxProMemo: - m_aMemoHeader.db_typ = MemoFoxPro; + m_aMemoHeader.db_typ = MemoFoxPro; m_pMemoStream->Seek(6L); m_pMemoStream->SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN); (*m_pMemoStream) >> m_aMemoHeader.db_size; @@ -665,7 +665,7 @@ void ODbaseTable::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new ODbaseColumns(this,m_aMutex,aVector); + m_pColumns = new ODbaseColumns(this,m_aMutex,aVector); } // ------------------------------------------------------------------------- void ODbaseTable::refreshIndexes() @@ -710,7 +710,7 @@ void ODbaseTable::refreshIndexes() if(m_pIndexes) m_pIndexes->reFill(aVector); else - m_pIndexes = new ODbaseIndexes(this,m_aMutex,aVector); + m_pIndexes = new ODbaseIndexes(this,m_aMutex,aVector); } // ------------------------------------------------------------------------- @@ -733,7 +733,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException) const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) { - if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) || + if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) || *pBegin == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))) { aOwnTypes.push_back(*pBegin); @@ -748,7 +748,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException) Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::queryInterface" ); - if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) || + if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) || rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0)) return Any(); @@ -810,32 +810,32 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s sal_Int32 nType = 0; if(_bUseTableDefs) { - nLen = m_aPrecisions[i-1]; - nType = m_aTypes[i-1]; + nLen = m_aPrecisions[i-1]; + nType = m_aTypes[i-1]; } else { - (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen; - (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; + (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen; + (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; } switch(nType) { - case DataType::INTEGER: + case DataType::INTEGER: case DataType::DOUBLE: case DataType::TIMESTAMP: - case DataType::DATE: - case DataType::BIT: - case DataType::LONGVARCHAR: - case DataType::LONGVARBINARY: - nLen = m_aRealFieldLengths[i-1]; + case DataType::DATE: + case DataType::BIT: + case DataType::LONGVARCHAR: + case DataType::LONGVARBINARY: + nLen = m_aRealFieldLengths[i-1]; break; case DataType::DECIMAL: if(_bUseTableDefs) nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,m_aScales[i-1]); else nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,getINT32((*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))); - break; // das Vorzeichen und das Komma - + break; // das Vorzeichen und das Komma + case DataType::BINARY: case DataType::OTHER: nByteOffset += nLen; @@ -904,7 +904,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s { sal_Int64 nValue = 0; memcpy(&nValue, pData, nLen); - + if ( m_aScales[i-1] ) d = (double)(nValue / pow(10.0,(int)m_aScales[i-1])); else @@ -914,7 +914,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s { memcpy(&d, pData, nLen); } - + *(_rRow->get())[i] = d; } else @@ -941,7 +941,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s { // Empty string. Skip it. nByteOffset += nLen; - (_rRow->get())[i]->setNull(); // keine Werte -> fertig + (_rRow->get())[i]->setNull(); // keine Werte -> fertig continue; } @@ -974,8 +974,8 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s { case 'T': case 'Y': - case 'J': b = TRUE; break; - default: b = FALSE; break; + case 'J': b = TRUE; break; + default: b = FALSE; break; } *(_rRow->get())[i] = b; } @@ -984,7 +984,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s case DataType::BINARY: case DataType::LONGVARCHAR: { - const long nBlockNo = aStr.toInt32(); // Blocknummer lesen + const long nBlockNo = aStr.toInt32(); // Blocknummer lesen if (nBlockNo > 0 && m_pMemoStream) // Daten aus Memo-Datei lesen, nur wenn { if ( !ReadMemo(nBlockNo, (_rRow->get())[i]->get()) ) @@ -992,7 +992,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s } else (_rRow->get())[i]->setNull(); - } break; + } break; default: OSL_ASSERT("Falscher Type"); } @@ -1112,7 +1112,7 @@ BOOL ODbaseTable::CreateImpl() } catch(const Exception&) { - + const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_COULD_NOT_DELETE_FILE, "$name$", aName @@ -1170,7 +1170,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo) Reference<XIndexAccess> xColumns(getColumns(),UNO_QUERY); Reference<XPropertySet> xCol; const ::rtl::OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); - + try { const sal_Int32 nCount = xColumns->getCount(); @@ -1182,7 +1182,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo) switch (getINT32(xCol->getPropertyValue(sPropType))) { case DataType::DOUBLE: - case DataType::INTEGER: + case DataType::INTEGER: case DataType::TIMESTAMP: case DataType::LONGVARBINARY: nDbaseType = VisualFoxPro; @@ -1226,7 +1226,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo) const ::rtl::OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); const ::rtl::OUString sPropPrec = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION); const ::rtl::OUString sPropScale = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE); - + try { const sal_Int32 nCount = xColumns->getCount(); @@ -1303,7 +1303,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo) if ( nDbaseType == VisualFoxPro ) (*m_pFileStream) << (nRecLength-1); else - m_pFileStream->Write(aBuffer, 4); + m_pFileStream->Write(aBuffer, 4); switch(cTyp) { @@ -1523,7 +1523,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X BOOL bInsertRow = UpdateBuffer( rRow, NULL, _xCols ); if ( bInsertRow ) { - nFileSize = lcl_getFileSize(*m_pFileStream); + nFileSize = lcl_getFileSize(*m_pFileStream); if (HasMemoFields() && m_pMemoStream) { @@ -1537,7 +1537,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X if (HasMemoFields() && m_pMemoStream) m_pMemoStream->SetStreamSize(nMemoFileSize); // alte Groesse restaurieren - m_nFilePos = nTempPos; // Fileposition restaurieren + m_nFilePos = nTempPos; // Fileposition restaurieren } else { @@ -1552,7 +1552,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X // bei Erfolg # erhoehen m_aHeader.db_anz++; - *rRow.get()[0] = m_nFilePos; // BOOKmark setzen + *rRow.get()[0] = m_nFilePos; // BOOKmark setzen m_nFilePos = nTempPos; } } @@ -1769,18 +1769,18 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const sal_Int32 nScale = 0; if ( i < m_aPrecisions.size() ) { - nLen = m_aPrecisions[i]; - nType = m_aTypes[i]; - nScale = m_aScales[i]; + nLen = m_aPrecisions[i]; + nType = m_aTypes[i]; + nScale = m_aScales[i]; } else { m_pColumns->getByIndex(i) >>= xCol; if ( xCol.is() ) { - xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen; - xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; - xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale; + xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen; + xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; + xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale; } } @@ -1793,14 +1793,14 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const bSetZero = true; case DataType::LONGVARBINARY: case DataType::DATE: - case DataType::BIT: + case DataType::BIT: case DataType::LONGVARCHAR: - nLen = m_aRealFieldLengths[i]; + nLen = m_aRealFieldLengths[i]; break; case DataType::DECIMAL: nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,nScale); - break; // The sign and the comma - default: + break; // The sign and the comma + default: break; } // switch (nType) @@ -1852,9 +1852,9 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const if (rRow.get()[nPos]->getValue().isNull()) { if ( bSetZero ) - memset(pData,0,nLen); // Clear to NULL + memset(pData,0,nLen); // Clear to NULL else - memset(pData,' ',nLen); // Clear to NULL + memset(pData,' ',nLen); // Clear to NULL nByteOffset += nLen; OSL_ENSURE( nByteOffset <= m_nBufferSize ,"ByteOffset > m_nBufferSize!"); continue; @@ -1901,7 +1901,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const { const double d = rRow.get()[nPos]->getValue(); m_pColumns->getByIndex(i) >>= xCol; - + if (getBOOL(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency wird gesondert behandelt { sal_Int64 nValue = 0; @@ -1917,7 +1917,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const break; case DataType::DECIMAL: { - memset(pData,' ',nLen); // Clear to NULL + memset(pData,' ',nLen); // Clear to NULL const double n = rRow.get()[nPos]->getValue(); @@ -1957,9 +1957,9 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const case DataType::LONGVARCHAR: { char cNext = pData[nLen]; // Mark's scratch and replaced by 0 - pData[nLen] = '\0'; // This is because the buffer is always a sign of greater ... + pData[nLen] = '\0'; // This is because the buffer is always a sign of greater ... - ULONG nBlockNo = strtol((const char *)pData,NULL,10); // Block number read + ULONG nBlockNo = strtol((const char *)pData,NULL,10); // Block number read // Next initial character restore again: pData[nLen] = cNext; @@ -1971,18 +1971,18 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const aStr.Expand(static_cast<sal_uInt16>(nLen - aBlock.Len()), '0' ); aStr += aBlock; // Copy characters: - memset(pData,' ',nLen); // Clear to NULL + memset(pData,' ',nLen); // Clear to NULL memcpy(pData, aStr.GetBuffer(), nLen); - } break; + } break; default: { - memset(pData,' ',nLen); // Clear to NULL + memset(pData,' ',nLen); // Clear to NULL ::rtl::OUString sStringToWrite( rRow.get()[nPos]->getValue().getString() ); // convert the string, using the connection's encoding ::rtl::OString sEncoded; - + DBTypeConversion::convertUnicodeStringToLength( sStringToWrite, sEncoded, nLen, m_eEncoding ); memcpy( pData, sEncoded.getStr(), sEncoded.getLength() ); @@ -2336,9 +2336,9 @@ namespace Content aContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>()); Sequence< PropertyValue > aProps( 1 ); - aProps[0].Name = ::rtl::OUString::createFromAscii("Title"); - aProps[0].Handle = -1; // n/a - aProps[0].Value = makeAny( ::rtl::OUString(sNewName) ); + aProps[0].Name = ::rtl::OUString::createFromAscii("Title"); + aProps[0].Handle = -1; // n/a + aProps[0].Value = makeAny( ::rtl::OUString(sNewName) ); Sequence< Any > aValues; aContent.executeCommand( rtl::OUString::createFromAscii( "setPropertyValues" ),makeAny(aProps) ) >>= aValues; if(aValues.getLength() && aValues[0].hasValue()) @@ -2552,7 +2552,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos) bOk = fetchRow( aRow, *m_aColumns, sal_True, sal_True); if ( bOk && !aRow->isDeleted() ) // copy only not deleted rows { - // special handling when pos == 0 then we don't have to distinguish between the two rows + // special handling when pos == 0 then we don't have to distinguish between the two rows if(_nPos) { aIter = aRow->get().begin()+1; @@ -2584,7 +2584,7 @@ void ODbaseTable::throwInvalidDbaseFormat() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::throwInvalidDbaseFormat" ); FileClose(); // no dbase file - + const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_DBASE_FILE, "$filename$", getEntry(m_pConnection,m_Name) @@ -2674,7 +2674,7 @@ Error: m_nFilePos = 0; break; case IResultSetHelper::BOOKMARK: - m_nFilePos = nTempPos; // vorherige Position + m_nFilePos = nTempPos; // vorherige Position } return sal_False; @@ -2696,7 +2696,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable) const char cEOF = (char) DBF_EOL; ByteString aBStr; static char aBuf[514]; - aBuf[512] = 0; // sonst kann der Zufall uebel mitspielen + aBuf[512] = 0; // sonst kann der Zufall uebel mitspielen BOOL bReady = sal_False; do @@ -2789,7 +2789,7 @@ void ODbaseTable::AllocBuffer() if (m_pBuffer == NULL && nSize) { m_nBufferSize = nSize; - m_pBuffer = new BYTE[m_nBufferSize+1]; + m_pBuffer = new BYTE[m_nBufferSize+1]; } } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 17bcf3b27ba4..507d91fb3e7d 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.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 @@ -53,7 +53,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -namespace starutil = ::com::sun::star::util; +namespace starutil = ::com::sun::star::util; sdbcx::ObjectType ODbaseTables::createObject(const ::rtl::OUString& _rName) { diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index c576aa4b46f6..69bd7ffec019 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.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 @@ -116,8 +116,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/dbase/dbase.xcu b/connectivity/source/drivers/dbase/dbase.xcu index f5de1d53ab0e..319b8d79a9c1 100755 --- a/connectivity/source/drivers/dbase/dbase.xcu +++ b/connectivity/source/drivers/dbase/dbase.xcu @@ -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/source/drivers/dbase/dbase.xml b/connectivity/source/drivers/dbase/dbase.xml index 3ebfd6185380..e378fcd5fdb6 100644 --- a/connectivity/source/drivers/dbase/dbase.xml +++ b/connectivity/source/drivers/dbase/dbase.xml @@ -12,7 +12,7 @@ <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> <supported-service>com.sun.star.sdbcx.Driver</supported-service> - <service-dependency> ... </service-dependency> + <service-dependency> ... </service-dependency> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 719f5b0d1cbc..f769980ed216 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.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 @@ -204,7 +204,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft) { // geht davon aus, dass der Knoten, auf dem die Bedingung (<=) // zutrifft, als m_nCurNode gesetzt ist - --nCount; // (sonst bekomme ich u.U. Assertions und GPFs - 60593) + --nCount; // (sonst bekomme ich u.U. Assertions und GPFs - 60593) bResult = Insert(rIndex.m_nCurNode + 1, rNode); } else // Position unbekannt @@ -212,7 +212,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft) USHORT nPos = NODE_NOTFOUND; while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()) ; - --nCount; // (sonst bekomme ich u.U. Assertions und GPFs - 60593) + --nCount; // (sonst bekomme ich u.U. Assertions und GPFs - 60593) bResult = Insert(nPos, rNode); } @@ -432,7 +432,7 @@ BOOL ONDXPage::Delete(USHORT nNodePos) ONDXNode ONDXPage::Split(ONDXPage& rPage) { DBG_ASSERT(IsFull(), "Falsches Splitting"); - /* Aufteilen einer Seite auf zwei + /* Aufteilen einer Seite auf zwei Blatt: Seite 1 behaelt (n - (n/2)) Seite 2 erhaelt (n/2) @@ -485,14 +485,14 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage) DBG_ASSERT(HasParent(), "kein Vater vorhanden"); DBG_ASSERT(nParentNodePos != NODE_NOTFOUND, "Falscher Indexaufbau"); - /* Zusammenlegen zweier Seiten */ + /* Zusammenlegen zweier Seiten */ ONDXNode aResultNode; USHORT nMaxNodes = rIndex.GetMaxNodes(), nMaxNodes_2 = nMaxNodes / 2; // Feststellen ob Seite rechter oder linker Nachbar - BOOL bRight = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // TRUE, wenn xPage die rechte Seite ist - USHORT nNewCount = (*xPage).Count() + Count(); + BOOL bRight = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // TRUE, wenn xPage die rechte Seite ist + USHORT nNewCount = (*xPage).Count() + Count(); if (IsLeaf()) { @@ -548,7 +548,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage) xPage->SetModified(FALSE); xPage->ReleaseFull(); // wird nicht mehr benoetigt } - // Ausgleichen der Elemente nNewCount >= (nMaxNodes_2 * 2) + // Ausgleichen der Elemente nNewCount >= (nMaxNodes_2 * 2) else { if (bRight) @@ -709,7 +709,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const if (!rIndex.isUnique() || rPage.IsLeaf()) rStream << (sal_uInt32)aKey.nRecord; // schluessel else - rStream << (sal_uInt32)0; // schluessel + rStream << (sal_uInt32)0; // schluessel if (rIndex.getHeader().db_keytype) // double { diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx index 948416bda4d7..55ff6ca510b7 100644 --- a/connectivity/source/drivers/evoab/LCatalog.cxx +++ b/connectivity/source/drivers/evoab/LCatalog.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/source/drivers/evoab/LCatalog.hxx b/connectivity/source/drivers/evoab/LCatalog.hxx index b8a205a38c83..589063d37e47 100644 --- a/connectivity/source/drivers/evoab/LCatalog.hxx +++ b/connectivity/source/drivers/evoab/LCatalog.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/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx index 320d42e65a8e..24dd9d6b3094 100644 --- a/connectivity/source/drivers/evoab/LColumnAlias.cxx +++ b/connectivity/source/drivers/evoab/LColumnAlias.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/source/drivers/evoab/LColumnAlias.hxx b/connectivity/source/drivers/evoab/LColumnAlias.hxx index 419d158fa105..9e870b6627cc 100644 --- a/connectivity/source/drivers/evoab/LColumnAlias.hxx +++ b/connectivity/source/drivers/evoab/LColumnAlias.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 @@ -94,14 +94,14 @@ namespace connectivity private: ::std::vector< ::rtl::OUString> m_aAlias; ::std::vector< ::rtl::OUString> m_aHeadLineNames; - ::std::map< ::rtl::OUString, ::rtl::OUString> m_aAliasMap; + ::std::map< ::rtl::OUString, ::rtl::OUString> m_aAliasMap; protected: ::osl::Mutex m_aMutex; public: void initialise(void); const ::std::vector< ::rtl::OUString> & getAlias(void) const; const ::std::map< ::rtl::OUString, ::rtl::OUString> & getAliasMap(void) const; - void setAlias(const ::com::sun::star::uno::Reference< + void setAlias(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &); private: void setAliasMap(void); diff --git a/connectivity/source/drivers/evoab/LColumns.hxx b/connectivity/source/drivers/evoab/LColumns.hxx index 5be028cdfe2e..3f146b2a9658 100644 --- a/connectivity/source/drivers/evoab/LColumns.hxx +++ b/connectivity/source/drivers/evoab/LColumns.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/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx index ed8b358db1df..3b5da2ebc04f 100644 --- a/connectivity/source/drivers/evoab/LConfigAccess.cxx +++ b/connectivity/source/drivers/evoab/LConfigAccess.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/source/drivers/evoab/LConfigAccess.hxx b/connectivity/source/drivers/evoab/LConfigAccess.hxx index c19c63c00750..3c82d3f5e3d1 100644 --- a/connectivity/source/drivers/evoab/LConfigAccess.hxx +++ b/connectivity/source/drivers/evoab/LConfigAccess.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/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx index cc0d8b9639a3..ba047b4e7db9 100644 --- a/connectivity/source/drivers/evoab/LConnection.cxx +++ b/connectivity/source/drivers/evoab/LConnection.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 @@ -84,7 +84,7 @@ using namespace ::com::sun::star::lang; } // -------------------------------------------------------------------------------- -OEvoabConnection::OEvoabConnection(OEvoabDriver* _pDriver) : OConnection(_pDriver) +OEvoabConnection::OEvoabConnection(OEvoabDriver* _pDriver) : OConnection(_pDriver) ,m_bHeaderLine(sal_True) ,m_cFieldDelimiter(',') ,m_cStringDelimiter('"') diff --git a/connectivity/source/drivers/evoab/LConnection.hxx b/connectivity/source/drivers/evoab/LConnection.hxx index 9d7df3e3d713..86bbd94b2cac 100644 --- a/connectivity/source/drivers/evoab/LConnection.hxx +++ b/connectivity/source/drivers/evoab/LConnection.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,29 +39,29 @@ namespace connectivity { class OEvoabConnection : public file::OConnection { - private: - OColumnAlias m_aColumnAlias; - sal_Bool m_bHeaderLine; // column names in first row - sal_Unicode m_cFieldDelimiter; // look at the name - sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter - sal_Unicode m_cDecimalDelimiter; // Dezimal-delimiter (Dezimalpoint) - sal_Unicode m_cThousandDelimiter; // - rtl::OUString m_aEvoFlatURI; + private: + OColumnAlias m_aColumnAlias; + sal_Bool m_bHeaderLine; // column names in first row + sal_Unicode m_cFieldDelimiter; // look at the name + sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter + sal_Unicode m_cDecimalDelimiter; // Dezimal-delimiter (Dezimalpoint) + sal_Unicode m_cThousandDelimiter; // + rtl::OUString m_aEvoFlatURI; public: - OEvoabConnection(OEvoabDriver* _pDriver); + OEvoabConnection(OEvoabDriver* _pDriver); virtual ~OEvoabConnection(); virtual void construct(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); // own methods - inline const OEvoabDriver* getDriver() const { return static_cast< const OEvoabDriver* >( m_pDriver ); } - inline sal_Bool isHeaderLine() const { return m_bHeaderLine; } - inline sal_Unicode getFieldDelimiter() const { return m_cFieldDelimiter; } - inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } - inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } - inline sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;} - const OColumnAlias& getColumnAlias() const { return m_aColumnAlias; } + inline const OEvoabDriver* getDriver() const { return static_cast< const OEvoabDriver* >( m_pDriver ); } + inline sal_Bool isHeaderLine() const { return m_bHeaderLine; } + inline sal_Unicode getFieldDelimiter() const { return m_cFieldDelimiter; } + inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } + inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } + inline sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;} + const OColumnAlias& getColumnAlias() const { return m_aColumnAlias; } // XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx index e8ef5ae53ab1..d1a15429a557 100644 --- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.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 @@ -76,7 +76,7 @@ namespace connectivity } } -OEvoabDatabaseMetaData::OEvoabDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon) +OEvoabDatabaseMetaData::OEvoabDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon) { } // ------------------------------------------------------------------------- @@ -204,8 +204,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns( ODatabaseMetaDataResultSet::ORow aRow(19); aRow[10] = new ORowSetValueDecorator((sal_Int32)10); Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames()); - const ::rtl::OUString* pTabBegin = aTabNames.getConstArray(); - const ::rtl::OUString* pTabEnd = pTabBegin + aTabNames.getLength(); + const ::rtl::OUString* pTabBegin = aTabNames.getConstArray(); + const ::rtl::OUString* pTabEnd = pTabBegin + aTabNames.getLength(); for(;pTabBegin != pTabEnd;++pTabBegin) { if(match(tableNamePattern,*pTabBegin,'\0')) @@ -303,7 +303,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( bTableFound = sal_False; const ::rtl::OUString* pBegin = types.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + nLength; + const ::rtl::OUString* pEnd = pBegin + nLength; for(;pBegin != pEnd;++pBegin) { if(*pBegin == aTable) @@ -317,11 +317,11 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( return xRef; OEvoabConnection* pOEvoabConnection = (OEvoabConnection*)m_pConnection; - OEvoabFolderList* pFolderList = new OEvoabFolderList( pOEvoabConnection ); + OEvoabFolderList* pFolderList = new OEvoabFolderList( pOEvoabConnection ); ODatabaseMetaDataResultSet::ORows aRows; - sal_Bool bMoreData = sal_True; + sal_Bool bMoreData = sal_True; ::rtl::OUString aName, aLocation; sal_Int32 nCardsCount; diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx index ebd693874818..a447a215c8df 100644 --- a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef _CONNECTIVITY_EVOAB_LDATABASEMETADATA_HXX_ #define _CONNECTIVITY_EVOAB_LDATABASEMETADATA_HXX_ @@ -40,7 +40,7 @@ namespace connectivity //************ Class: java.sql.DatabaseMetaDataDate //************************************************************** - class OEvoabDatabaseMetaData : public file::ODatabaseMetaData + class OEvoabDatabaseMetaData : public file::ODatabaseMetaData { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/evoab/LDebug.cxx b/connectivity/source/drivers/evoab/LDebug.cxx index b28e06c55b7e..042227947a79 100644 --- a/connectivity/source/drivers/evoab/LDebug.cxx +++ b/connectivity/source/drivers/evoab/LDebug.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/source/drivers/evoab/LDebug.hxx b/connectivity/source/drivers/evoab/LDebug.hxx index eeb9eed1860f..8b9e2b11ab77 100644 --- a/connectivity/source/drivers/evoab/LDebug.hxx +++ b/connectivity/source/drivers/evoab/LDebug.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 @@ -34,9 +34,9 @@ #ifdef _DEBUG void evo_traceStringMessage( const sal_Char* _pFormat, const ::rtl::OUString& _rAsciiString ); - #define EVO_TRACE_STRING( pFormat, rAsciiString ) evo_traceStringMessage( pFormat, rAsciiString ) + #define EVO_TRACE_STRING( pFormat, rAsciiString ) evo_traceStringMessage( pFormat, rAsciiString ) #else - #define EVO_TRACE_STRING( pFormat, rAsciiString ) (void)(0) + #define EVO_TRACE_STRING( pFormat, rAsciiString ) (void)(0) #endif diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx index 36363007246b..689ba848edc6 100644 --- a/connectivity/source/drivers/evoab/LDriver.cxx +++ b/connectivity/source/drivers/evoab/LDriver.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 @@ -337,7 +337,7 @@ const rtl::OUString OEvoabDriver::getEvoab_CLI_Command() const EVO_TRACE_STRING( "OEvoabDriver::getEvoab_CLI_Command()::aEvoab_CLI_Command = %s", aEvoab_CLI_Command ); - return aEvoab_CLI_Command; + return aEvoab_CLI_Command; } // ------------------------------------------------------------------------- const rtl::OUString OEvoabDriver::getEvoab_CLI_Path() const @@ -356,7 +356,7 @@ const rtl::OUString OEvoabDriver::getEvoab_CLI_Path() const aEvoab_CLI_Path = m_aEvoab_CLI_FullPathCommand.copy(0, nLen+1); EVO_TRACE_STRING( "OEvoabDriver::getEvoab_CLI_Path()::aEvoab_CLI_Path = %s", aEvoab_CLI_Path ); - return aEvoab_CLI_Path; + return aEvoab_CLI_Path; } // ------------------------------------------------------------------------- const rtl::OUString OEvoabDriver::getWorkingDirPath() const @@ -364,7 +364,7 @@ const rtl::OUString OEvoabDriver::getWorkingDirPath() const ::rtl::OUString aWorkingDirPath; if(m_bWorkingDirCreated) osl::File::getSystemPathFromFileURL( m_aWorkingDirURL, aWorkingDirPath ); - return aWorkingDirPath; + return aWorkingDirPath; } // ------------------------------------------------------------------------- const String OEvoabDriver::getEvoFolderListFileURL() const @@ -413,47 +413,47 @@ const sal_Char* OEvoabDriver::getSDBC_SCHEME_EVOLUTION() } const sal_Char* OEvoabDriver::getEVOAB_FOLDERLIST_FILE_NAME() { - static const sal_Char* EVOAB_FOLDERLIST_FILE_NAME = "FolderList"; + static const sal_Char* EVOAB_FOLDERLIST_FILE_NAME = "FolderList"; return EVOAB_FOLDERLIST_FILE_NAME; } const sal_Char* OEvoabDriver::getEVOAB_VERSION_FILE_NAME() { - static const sal_Char* EVOAB_VERSION_FILE_NAME = "EvoVersion"; + static const sal_Char* EVOAB_VERSION_FILE_NAME = "EvoVersion"; return EVOAB_VERSION_FILE_NAME; } const sal_Char* OEvoabDriver::getEVOAB_META_FILE_EXT() { - static const sal_Char* EVOAB_META_FILE_EXT = "csv"; + static const sal_Char* EVOAB_META_FILE_EXT = "csv"; return EVOAB_META_FILE_EXT; } const sal_Char* OEvoabDriver::getEVOAB_CLI_FULLPATHCOMMAND() { - static const sal_Char* EVOAB_CLI_FULLPATHCOMMAND = "file:///home/evoab/extra/share/evolution/*/tools/evolution-addressbook-export"; + static const sal_Char* EVOAB_CLI_FULLPATHCOMMAND = "file:///home/evoab/extra/share/evolution/*/tools/evolution-addressbook-export"; return EVOAB_CLI_FULLPATHCOMMAND; } const sal_Char* OEvoabDriver::getEVOAB_CLI_ARG_LIST_FOLDERS() { - static const sal_Char* EVOAB_CLI_ARG_LIST_FOLDERS = "-l"; + static const sal_Char* EVOAB_CLI_ARG_LIST_FOLDERS = "-l"; return EVOAB_CLI_ARG_LIST_FOLDERS; } const sal_Char* OEvoabDriver::getEVOAB_CLI_ARG_OUTPUT_FILE_PREFIX() { - static const sal_Char* EVOAB_CLI_ARG_OUTPUT_FILE_PREFIX = "--output="; + static const sal_Char* EVOAB_CLI_ARG_OUTPUT_FILE_PREFIX = "--output="; return EVOAB_CLI_ARG_OUTPUT_FILE_PREFIX; } const sal_Char* OEvoabDriver::getEVOAB_CLI_ARG_OUTPUT_FORMAT() { - static const sal_Char* EVOAB_CLI_ARG_OUTPUT_FORMAT = "--format=csv"; + static const sal_Char* EVOAB_CLI_ARG_OUTPUT_FORMAT = "--format=csv"; return EVOAB_CLI_ARG_OUTPUT_FORMAT; } const sal_Char* OEvoabDriver::getEVOAB_CLI_ARG_VERSION() { - static const sal_Char* EVOAB_CLI_ARG_VERSION = "--version"; + static const sal_Char* EVOAB_CLI_ARG_VERSION = "--version"; return EVOAB_CLI_ARG_VERSION; } const sal_Char* OEvoabDriver::getEVOAB_CLI_ARG_OUTPUT_REDIRECT() { - static const sal_Char* EVOAB_CLI_ARG_OUTPUT_REDIRECT = ">"; + static const sal_Char* EVOAB_CLI_ARG_OUTPUT_REDIRECT = ">"; return EVOAB_CLI_ARG_OUTPUT_REDIRECT; } rtl::OUString OEvoabDriver::translateFileErrorMessage( oslFileError nFileErr) diff --git a/connectivity/source/drivers/evoab/LDriver.hxx b/connectivity/source/drivers/evoab/LDriver.hxx index 65731264409e..598880fc278a 100644 --- a/connectivity/source/drivers/evoab/LDriver.hxx +++ b/connectivity/source/drivers/evoab/LDriver.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 @@ -36,9 +36,9 @@ #include <osl/file.h> #include <osl/process.h> -#define EVOAB_EVOLUTION_SCHEMA "evolution" -#define EVOAB_LDAP_SCHEMA "ldap" -#define EVOAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.evoab.OEvoabDriver" +#define EVOAB_EVOLUTION_SCHEMA "evolution" +#define EVOAB_LDAP_SCHEMA "ldap" +#define EVOAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.evoab.OEvoabDriver" namespace connectivity { @@ -56,34 +56,34 @@ namespace connectivity eTrue, eFalse }; - ::utl::TempFile m_aTempDir; - rtl::OUString m_aFolderListName; - rtl::OUString m_aVersionName; - rtl::OUString m_aFileExt; - rtl::OUString m_aWorkingDirURL; - rtl::OUString m_aEvoab_CLI_EffectiveCommand; - rtl::OUString m_aEvoab_CLI_FullPathCommand; - sal_Bool m_bWorkingDirCreated; + ::utl::TempFile m_aTempDir; + rtl::OUString m_aFolderListName; + rtl::OUString m_aVersionName; + rtl::OUString m_aFileExt; + rtl::OUString m_aWorkingDirURL; + rtl::OUString m_aEvoab_CLI_EffectiveCommand; + rtl::OUString m_aEvoab_CLI_FullPathCommand; + sal_Bool m_bWorkingDirCreated; MaybeVoidBool m_eSupportedEvoVersion; - sal_Bool fileExists(const ::rtl::OUString& _rURL, sal_Bool _bIsDir=sal_False) const; + sal_Bool fileExists(const ::rtl::OUString& _rURL, sal_Bool _bIsDir=sal_False) const; public: OEvoabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); - inline rtl::OUString getEvoFolderListName() const { return m_aFolderListName;} - inline rtl::OUString getFileExt() const { return m_aFileExt;} - inline rtl::OUString getEvoFolderListFileName() const { return m_aFolderListName + ::rtl::OUString::createFromAscii(".") + m_aFileExt;} - inline rtl::OUString getEvoVersionFileName() const { return m_aVersionName + ::rtl::OUString::createFromAscii(".") + m_aFileExt;} - inline rtl::OUString getWorkingDirURL() const { return m_aWorkingDirURL;} - inline rtl::OUString getEvoab_CLI_FullPathCommand() const { return m_aEvoab_CLI_FullPathCommand;} - inline rtl::OUString getEvoab_CLI_EffectiveCommand() const { return m_aEvoab_CLI_EffectiveCommand;} - inline sal_Bool doesEvoab_CLI_HavePath() const { return m_aEvoab_CLI_FullPathCommand.lastIndexOf('/')!=-1;} - const rtl::OUString getEvoab_CLI_Command() const; - const rtl::OUString getEvoab_CLI_Path() const; - const rtl::OUString getWorkingDirPath() const; - const String getEvoFolderListFileURL() const; - String getTempDirURL() const; + inline rtl::OUString getEvoFolderListName() const { return m_aFolderListName;} + inline rtl::OUString getFileExt() const { return m_aFileExt;} + inline rtl::OUString getEvoFolderListFileName() const { return m_aFolderListName + ::rtl::OUString::createFromAscii(".") + m_aFileExt;} + inline rtl::OUString getEvoVersionFileName() const { return m_aVersionName + ::rtl::OUString::createFromAscii(".") + m_aFileExt;} + inline rtl::OUString getWorkingDirURL() const { return m_aWorkingDirURL;} + inline rtl::OUString getEvoab_CLI_FullPathCommand() const { return m_aEvoab_CLI_FullPathCommand;} + inline rtl::OUString getEvoab_CLI_EffectiveCommand() const { return m_aEvoab_CLI_EffectiveCommand;} + inline sal_Bool doesEvoab_CLI_HavePath() const { return m_aEvoab_CLI_FullPathCommand.lastIndexOf('/')!=-1;} + const rtl::OUString getEvoab_CLI_Command() const; + const rtl::OUString getEvoab_CLI_Path() const; + const rtl::OUString getWorkingDirPath() const; + const String getEvoFolderListFileURL() const; + String getTempDirURL() const; // XInterface ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx index b5757ca1ac37..e7833f25edfb 100644 --- a/connectivity/source/drivers/evoab/LFolderList.cxx +++ b/connectivity/source/drivers/evoab/LFolderList.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 @@ -42,7 +42,7 @@ #include <comphelper/sequence.hxx> #include <svl/zforlist.hxx> #include <rtl/math.hxx> -#include <stdio.h> //sprintf +#include <stdio.h> //sprintf #include <comphelper/extract.hxx> #include <comphelper/numbers.hxx> #include "LDriver.hxx" @@ -246,7 +246,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal break; default: eType = DataType::VARCHAR; - nPrecision = 0; // nyi: Daten koennen aber laenger sein! + nPrecision = 0; // nyi: Daten koennen aber laenger sein! nScale = 0; aTypeName = ::rtl::OUString::createFromAscii("VARCHAR"); }; @@ -324,8 +324,8 @@ void OEvoabFolderList::construct() // Buffersize abhaengig von der Filegroesse m_pFileStream->SetBufferSize(nSize > 1000000 ? 32768 : - nSize > 100000 ? 16384 : - nSize > 10000 ? 4096 : 1024); + nSize > 100000 ? 16384 : + nSize > 10000 ? 4096 : 1024); OSL_TRACE("OEvoabFolderList::construct()::m_pFileStream->Tell() = %d\n", nSize ); fillColumns(aAppLocale); @@ -336,7 +336,7 @@ void OEvoabFolderList::construct() //------------------------------------------------------------------ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) { - (_rRow->get())[0] = m_nFilePos; // the "bookmark" + (_rRow->get())[0] = m_nFilePos; // the "bookmark" OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection; // Felder: @@ -353,7 +353,7 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) else { // length depending on the data type - sal_Int32 nType = m_aTypes[i]; + sal_Int32 nType = m_aTypes[i]; switch(nType) { case DataType::TIMESTAMP: @@ -384,10 +384,10 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) { (_rRow->get())[i+1].setNull(); } - } break; + } break; case DataType::DOUBLE: case DataType::INTEGER: - case DataType::DECIMAL: // #99178# OJ + case DataType::DECIMAL: // #99178# OJ case DataType::NUMERIC: { sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter(); @@ -526,7 +526,7 @@ void OEvoabFolderList::initializeRow(sal_Int32 _nColumnCount) { if(!m_aRow.is()) { - m_aRow = new OValueVector(_nColumnCount); + m_aRow = new OValueVector(_nColumnCount); (m_aRow->get())[0].setBound(sal_True); ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetBound(sal_False)); } diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx index db26ab8d030f..a7eb508d6756 100644 --- a/connectivity/source/drivers/evoab/LFolderList.hxx +++ b/connectivity/source/drivers/evoab/LFolderList.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 @@ -47,20 +47,20 @@ namespace connectivity class OEvoabConnection; - class OEvoabFolderList + class OEvoabFolderList { // maps a row postion to a file position - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth - ::std::vector<sal_Int32> m_aScales; + ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + ::std::vector<sal_Int32> m_aPrecisions; // same as aboth + ::std::vector<sal_Int32> m_aScales; QuotedTokenizedString m_aCurrentLine; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xNumberFormatter; - sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement - SvStream* m_pFileStream; - OEvoabConnection* m_pConnection; - ::rtl::Reference<OSQLColumns> m_aColumns; - OValueRow m_aRow; - sal_Bool m_bIsNull; + sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement + SvStream* m_pFileStream; + OEvoabConnection* m_pConnection; + ::rtl::Reference<OSQLColumns> m_aColumns; + OValueRow m_aRow; + sal_Bool m_bIsNull; private: void fillColumns(const ::com::sun::star::lang::Locale& _aLocale); diff --git a/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx index 2a5fa999587b..c8578fedb016 100644 --- a/connectivity/source/drivers/evoab/LNoException.cxx +++ b/connectivity/source/drivers/evoab/LNoException.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 @@ -41,8 +41,8 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel ) return 0; xub_StrLen nTokCount = 1; - BOOL bStart = TRUE; // Stehen wir auf dem ersten Zeichen im Token? - BOOL bInString = FALSE; // Befinden wir uns INNERHALB eines (cStrDel delimited) String? + BOOL bStart = TRUE; // Stehen wir auf dem ersten Zeichen im Token? + BOOL bInString = FALSE; // Befinden wir uns INNERHALB eines (cStrDel delimited) String? // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen for( xub_StrLen i = 0; i < Len(); i++ ) @@ -53,8 +53,8 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel ) // Erstes Zeichen ein String-Delimiter? if ((*this).GetChar(i) == cStrDel) { - bInString = TRUE; // dann sind wir jetzt INNERHALB des Strings! - continue; // dieses Zeichen ueberlesen! + bInString = TRUE; // dann sind wir jetzt INNERHALB des Strings! + continue; // dieses Zeichen ueberlesen! } } @@ -65,7 +65,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel ) if ((i+1 < Len()) && ((*this).GetChar(i+1) == cStrDel)) { // Verdoppeltes String-Delimiter-Zeichen: - i++; // kein String-Ende, naechstes Zeichen ueberlesen. + i++; // kein String-Ende, naechstes Zeichen ueberlesen. } else { @@ -94,11 +94,11 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni xub_StrLen nLen = Len(); if ( nLen ) { - BOOL bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String? + BOOL bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String? // Erstes Zeichen ein String-Delimiter? if (bInString ) - ++nStartPos; // dieses Zeichen ueberlesen! + ++nStartPos; // dieses Zeichen ueberlesen! // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen for( xub_StrLen i = nStartPos; i < nLen; ++i ) { @@ -110,9 +110,9 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni if ((i+1 < nLen) && ((*this).GetChar(i+1) == cStrDel)) { // Verdoppeltes String-Delimiter-Zeichen: - ++i; // kein String-Ende, naechstes Zeichen ueberlesen. + ++i; // kein String-Ende, naechstes Zeichen ueberlesen. - _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String + _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String } else { @@ -122,7 +122,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni } else { - _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String + _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String } } @@ -138,7 +138,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni } else { - _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String + _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String } } } @@ -283,7 +283,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In aIter = m_aRowToFilePos.upper_bound(nOffset); if(aIter == m_aRowToFilePos.end()) { - m_nRowPos = m_aRowToFilePos.rbegin()->first; + m_nRowPos = m_aRowToFilePos.rbegin()->first; nCurPos = m_nFilePos = m_aRowToFilePos.rbegin()->second; while(m_nRowPos != nOffset) seekRow(IResultSetHelper::NEXT,1,nCurPos); @@ -291,8 +291,8 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In else { --aIter; - m_nRowPos = aIter->first; - m_nFilePos = aIter->second; + m_nRowPos = aIter->first; + m_nFilePos = aIter->second; m_pFileStream->Seek(m_nFilePos); if (m_pFileStream->IsEof() || !checkHeaderLine()) return sal_False; @@ -310,7 +310,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In if (m_pFileStream->IsEof()) return sal_False; - m_nFilePos = m_pFileStream->Tell(); // Byte-Position in der Datei merken (am ZeilenANFANG) + m_nFilePos = m_pFileStream->Tell(); // Byte-Position in der Datei merken (am ZeilenANFANG) m_pFileStream->ReadByteStringLine(m_aCurrentLine,pConnection->getTextEncoding()); if (m_pFileStream->IsEof()) return sal_False; diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.cxx b/connectivity/source/drivers/evoab/LPreparedStatement.cxx index fee0905e29ab..3c04d4b38ca7 100644 --- a/connectivity/source/drivers/evoab/LPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab/LPreparedStatement.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/source/drivers/evoab/LPreparedStatement.hxx b/connectivity/source/drivers/evoab/LPreparedStatement.hxx index 700768c686c0..13671dee9ce7 100644 --- a/connectivity/source/drivers/evoab/LPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab/LPreparedStatement.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/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx index 79c291126f48..7bcc71d4074d 100644 --- a/connectivity/source/drivers/evoab/LResultSet.cxx +++ b/connectivity/source/drivers/evoab/LResultSet.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 @@ -45,10 +45,10 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// using namespace com::sun::star::container; -// using namespace com::sun::star::util; +// using namespace com::sun::star::container; +// using namespace com::sun::star::util; //------------------------------------------------------------------------------ -OEvoabResultSet::OEvoabResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) +OEvoabResultSet::OEvoabResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) : file::OResultSet(pStmt,_aSQLIterator) ,m_bBookmarkable(sal_True) { @@ -93,7 +93,7 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException { Sequence< Type > aTypes = OResultSet::getTypes(); ::std::vector<Type> aOwnTypes; - aOwnTypes.reserve(aTypes.getLength()); + aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) @@ -116,7 +116,7 @@ Any SAL_CALL OEvoabResultSet::getBookmark( ) throw( SQLException, RuntimeExcep { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } @@ -125,7 +125,7 @@ sal_Bool SAL_CALL OEvoabResultSet::moveToBookmark( const Any& bookmark ) throw( { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False; @@ -136,7 +136,7 @@ sal_Bool SAL_CALL OEvoabResultSet::moveRelativeToBookmark( const Any& bookmark, { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False; diff --git a/connectivity/source/drivers/evoab/LResultSet.hxx b/connectivity/source/drivers/evoab/LResultSet.hxx index ebd64292e911..35d4dcd49194 100644 --- a/connectivity/source/drivers/evoab/LResultSet.hxx +++ b/connectivity/source/drivers/evoab/LResultSet.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 @@ -40,11 +40,11 @@ namespace connectivity class OEvoabResultSet; // these typedef's are only necessary for the compiler typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XRowLocate> OEvoabResultSet_BASE; - typedef file::OResultSet OEvoabResultSet_BASE2; - typedef ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet> OEvoabResultSet_BASE3; + typedef file::OResultSet OEvoabResultSet_BASE2; + typedef ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet> OEvoabResultSet_BASE3; - class OEvoabResultSet : public OEvoabResultSet_BASE2, + class OEvoabResultSet : public OEvoabResultSet_BASE2, public OEvoabResultSet_BASE, public OEvoabResultSet_BASE3 { @@ -57,7 +57,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - OEvoabResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); + OEvoabResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx index c99a9044994d..6619d90ebb96 100644 --- a/connectivity/source/drivers/evoab/LServices.cxx +++ b/connectivity/source/drivers/evoab/LServices.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 @@ -116,8 +116,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/evoab/LStatement.cxx b/connectivity/source/drivers/evoab/LStatement.cxx index a6350f11139b..0e29bcf1cb9b 100644 --- a/connectivity/source/drivers/evoab/LStatement.cxx +++ b/connectivity/source/drivers/evoab/LStatement.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/source/drivers/evoab/LStatement.hxx b/connectivity/source/drivers/evoab/LStatement.hxx index a870c4722034..e2454dc2a578 100644 --- a/connectivity/source/drivers/evoab/LStatement.hxx +++ b/connectivity/source/drivers/evoab/LStatement.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/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx index 898f445e1d3b..505337dacf88 100644 --- a/connectivity/source/drivers/evoab/LTable.cxx +++ b/connectivity/source/drivers/evoab/LTable.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 @@ -42,7 +42,7 @@ #include <comphelper/sequence.hxx> #include <svl/zforlist.hxx> #include <rtl/math.hxx> -#include <stdio.h> //sprintf +#include <stdio.h> //sprintf #include <comphelper/extract.hxx> #include <comphelper/numbers.hxx> #include "LDriver.hxx" @@ -267,7 +267,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) break; default: eType = DataType::VARCHAR; - nPrecision = 0; // nyi: Daten koennen aber laenger sein! + nPrecision = 0; // nyi: Daten koennen aber laenger sein! nScale = 0; aTypeName = ::rtl::OUString::createFromAscii("VARCHAR"); }; @@ -364,8 +364,8 @@ void OEvoabTable::construct() // Buffersize abhaengig von der Filegroesse m_pFileStream->SetBufferSize(nSize > 1000000 ? 32768 : - nSize > 100000 ? 16384 : - nSize > 10000 ? 4096 : 1024); + nSize > 100000 ? 16384 : + nSize > 10000 ? 4096 : 1024); OSL_TRACE("OEvoabTable::construct()::m_pFileStream->Tell() = %d\n", nSize ); fillColumns(aAppLocale); @@ -431,7 +431,7 @@ void OEvoabTable::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new OEvoabColumns(this,m_aMutex,aVector); + m_pColumns = new OEvoabColumns(this,m_aMutex,aVector); OSL_TRACE("OEvoabTable::refreshColumns()::end\n" ); } @@ -453,10 +453,10 @@ Sequence< Type > SAL_CALL OEvoabTable::getTypes( ) throw(RuntimeException) const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) { - if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) || - *pBegin == ::getCppuType((const Reference<XRename>*)0) || + if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) || + *pBegin == ::getCppuType((const Reference<XRename>*)0) || *pBegin == ::getCppuType((const Reference<XIndexesSupplier>*)0) || - *pBegin == ::getCppuType((const Reference<XAlterTable>*)0) || + *pBegin == ::getCppuType((const Reference<XAlterTable>*)0) || *pBegin == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))) { aOwnTypes.push_back(*pBegin); @@ -469,10 +469,10 @@ Sequence< Type > SAL_CALL OEvoabTable::getTypes( ) throw(RuntimeException) // ------------------------------------------------------------------------- Any SAL_CALL OEvoabTable::queryInterface( const Type & rType ) throw(RuntimeException) { - if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) || - rType == ::getCppuType((const Reference<XIndexesSupplier>*)0) || - rType == ::getCppuType((const Reference<XRename>*)0) || - rType == ::getCppuType((const Reference<XAlterTable>*)0) || + if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) || + rType == ::getCppuType((const Reference<XIndexesSupplier>*)0) || + rType == ::getCppuType((const Reference<XRename>*)0) || + rType == ::getCppuType((const Reference<XAlterTable>*)0) || rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0)) return Any(); @@ -527,18 +527,18 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa else { // Laengen je nach Datentyp: - sal_Int32 nLen, + sal_Int32 nLen, nType = 0; if(bIsTable) { - nLen = m_aPrecisions[i]; - nType = m_aTypes[i]; + nLen = m_aPrecisions[i]; + nType = m_aTypes[i]; } else { Reference< XPropertySet> xColumn = *aIter; - xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen; - xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; + xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen; + xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; } switch(nType) { @@ -570,10 +570,10 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa { (_rRow->get())[i+1]->setNull(); } - } break; + } break; case DataType::DOUBLE: case DataType::INTEGER: - case DataType::DECIMAL: // #99178# OJ + case DataType::DECIMAL: // #99178# OJ case DataType::NUMERIC: { sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter(); @@ -824,7 +824,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In aIter = m_aRowToFilePos.upper_bound(nOffset); if(aIter == m_aRowToFilePos.end()) { - m_nRowPos = m_aRowToFilePos.rbegin()->first; + m_nRowPos = m_aRowToFilePos.rbegin()->first; nCurPos = m_nFilePos = m_aRowToFilePos.rbegin()->second; while(m_nRowPos != nOffset) seekRow(IResultSetHelper::NEXT,1,nCurPos); @@ -832,8 +832,8 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In else { --aIter; - m_nRowPos = aIter->first; - m_nFilePos = aIter->second; + m_nRowPos = aIter->first; + m_nFilePos = aIter->second; m_pFileStream->Seek(m_nFilePos); if (m_pFileStream->IsEof() || !checkHeaderLine()) return sal_False; @@ -851,7 +851,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In if (m_pFileStream->IsEof()) return sal_False; - m_nFilePos = m_pFileStream->Tell(); // Byte-Position in der Datei merken (am ZeilenANFANG) + m_nFilePos = m_pFileStream->Tell(); // Byte-Position in der Datei merken (am ZeilenANFANG) m_pFileStream->ReadByteStringLine(m_aCurrentLine,pConnection->getTextEncoding()); if (m_pFileStream->IsEof()) return sal_False; diff --git a/connectivity/source/drivers/evoab/LTable.hxx b/connectivity/source/drivers/evoab/LTable.hxx index 998086be4985..f9659a927ce3 100644 --- a/connectivity/source/drivers/evoab/LTable.hxx +++ b/connectivity/source/drivers/evoab/LTable.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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef _CONNECTIVITY_EVOAB_LTABLE_HXX_ #define _CONNECTIVITY_EVOAB_LTABLE_HXX_ @@ -46,21 +46,21 @@ namespace connectivity typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; - class OEvoabTable : public OEvoabTable_BASE + class OEvoabTable : public OEvoabTable_BASE { private: // maps a row postion to a file position ::std::map<sal_Int32,sal_Int32> m_aRowToFilePos; - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth - ::std::vector<sal_Int32> m_aScales; + ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + ::std::vector<sal_Int32> m_aPrecisions; // same as aboth + ::std::vector<sal_Int32> m_aScales; QuotedTokenizedString m_aCurrentLine; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xNumberFormatter; - sal_Int32 m_nRowPos; - sal_Int32 m_nMaxRowCount; // will be set if stream is once eof - ::std::vector< ::rtl::OUString> m_aColumnRawNames; - sal_Bool setColumnAliases(); - void fillColumns(const ::com::sun::star::lang::Locale& _aLocale); + sal_Int32 m_nRowPos; + sal_Int32 m_nMaxRowCount; // will be set if stream is once eof + ::std::vector< ::rtl::OUString> m_aColumnRawNames; + sal_Bool setColumnAliases(); + void fillColumns(const ::com::sun::star::lang::Locale& _aLocale); sal_Bool checkHeaderLine(); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet> isUniqueByColumnName(const ::rtl::OUString& _rColName); @@ -69,7 +69,7 @@ namespace connectivity virtual void refreshIndexes(); public: - // DECLARE_CTY_DEFAULTS( OFlatTable_BASE); + // DECLARE_CTY_DEFAULTS( OFlatTable_BASE); OEvoabTable( sdbcx::OCollection* _pTables,OEvoabConnection* _pConnection); OEvoabTable( sdbcx::OCollection* _pTables,OEvoabConnection* _pConnection, const ::rtl::OUString& _Name, diff --git a/connectivity/source/drivers/evoab/LTables.cxx b/connectivity/source/drivers/evoab/LTables.cxx index ff27bf54ffad..c104f9c3151d 100644 --- a/connectivity/source/drivers/evoab/LTables.cxx +++ b/connectivity/source/drivers/evoab/LTables.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 @@ -49,7 +49,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -namespace starutil = ::com::sun::star::util; +namespace starutil = ::com::sun::star::util; sdbcx::ObjectType OEvoabTables::createObject(const ::rtl::OUString& _rName) { diff --git a/connectivity/source/drivers/evoab/LTables.hxx b/connectivity/source/drivers/evoab/LTables.hxx index ef2c3f838da3..c91957aa9bbd 100644 --- a/connectivity/source/drivers/evoab/LTables.hxx +++ b/connectivity/source/drivers/evoab/LTables.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/source/drivers/evoab/evoab.xcu b/connectivity/source/drivers/evoab/evoab.xcu index c54c9856cad9..4c8e3cc43ab3 100755 --- a/connectivity/source/drivers/evoab/evoab.xcu +++ b/connectivity/source/drivers/evoab/evoab.xcu @@ -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/source/drivers/evoab/evoab.xml b/connectivity/source/drivers/evoab/evoab.xml index f2bafcffdada..669eb109addd 100644 --- a/connectivity/source/drivers/evoab/evoab.xml +++ b/connectivity/source/drivers/evoab/evoab.xml @@ -12,7 +12,7 @@ <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> <supported-service>com.sun.star.sdbcx.Driver</supported-service> - <service-dependency> ... </service-dependency> + <service-dependency> ... </service-dependency> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index d670735d2144..1767ec1bcf5a 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.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 @@ -74,7 +74,7 @@ typedef void (*SymbolFunc) (void); SYM_MAP( e_book_query_to_string ), SYM_MAP( e_book_query_field_exists ), SYM_MAP( e_source_group_peek_base_uri) - }; + }; #undef SYM_MAP static bool @@ -120,13 +120,13 @@ bool EApiInit() // hjs: SOLARDEF does no longer exist please lookup the required // defines in a regular compile line /* - * Test code - enable & + * Test code - enable & * * Compile with ( after source LinuxIntelEnv.Set.sh ) gcc $SOLARDEF -I $SOLARVER/$UPD/$INPATH/inc \ -I. `pkg-config --cflags --libs gobject-2.0` \ -L $SOLARVER/$UPD/$INPATH/lib -luno_sal -lstdc++ EApi.cxx - */ + */ int main( int argc, char **argv) { diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h index 90422b7e01f8..c089fda927c3 100644 --- a/connectivity/source/drivers/evoab2/EApi.h +++ b/connectivity/source/drivers/evoab2/EApi.h @@ -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 @@ -57,7 +57,7 @@ typedef void EContact; typedef int EContactField; EAPI_EXTERN const char *(*e_contact_field_name) ( EContactField field_id); -EAPI_EXTERN gpointer (*e_contact_get) (EContact *contact, EContactField field_id); +EAPI_EXTERN gpointer (*e_contact_get) (EContact *contact, EContactField field_id); EAPI_EXTERN gconstpointer (*e_contact_get_const) (EContact *contact, EContactField field_id); // e-source.h typedef void ESource; @@ -90,14 +90,14 @@ typedef enum { typedef void EBook; typedef void EBookQuery; -EAPI_EXTERN EBook *(*e_book_new) (ESource *source, +EAPI_EXTERN EBook *(*e_book_new) (ESource *source, GError **error); -EAPI_EXTERN gboolean (*e_book_open) (EBook *book, +EAPI_EXTERN gboolean (*e_book_open) (EBook *book, gboolean only_if_exists, GError **error); -EAPI_EXTERN const char *(*e_book_get_uri) (EBook *book); +EAPI_EXTERN const char *(*e_book_get_uri) (EBook *book); EAPI_EXTERN ESource *(*e_book_get_source)(EBook *book); EAPI_EXTERN gboolean (*e_book_get_addressbooks) (ESourceList **addressbook_sources, diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index 0ed28663f72b..4698a6aab0ea 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.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 @@ -63,7 +63,7 @@ void OEvoabCatalog::refreshTables() { Reference< XRow > xRow(xResult,UNO_QUERY); ::rtl::OUString aName; - + while(xResult->next()) { aName = xRow->getString(3); diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index d55f218fd2df..b08b4e46a1c6 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.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/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx index cfed31d54422..53818b7507a7 100644 --- a/connectivity/source/drivers/evoab2/NColumns.cxx +++ b/connectivity/source/drivers/evoab2/NColumns.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/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index 8c98e9deaf17..34c01e911f8b 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.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,13 +39,13 @@ namespace connectivity class OEvoabColumns : public sdbcx::OCollection { protected: - OEvoabTable* m_pTable; + OEvoabTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - OEvoabColumns( OEvoabTable* _pTable, + OEvoabColumns( OEvoabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector ) : sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector), diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index a49f2683a106..caf6d11d36b9 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.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/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index c61d938ccf2c..2b25b76013ab 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.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 @@ #include "TConnection.hxx" #include <cppuhelper/weakref.hxx> #include <osl/module.h> -#include "EApi.h" +#include "EApi.h" namespace connectivity { @@ -48,21 +48,21 @@ namespace connectivity namespace SDBCAddress { typedef enum { - Unknown = 0, + Unknown = 0, EVO_LOCAL = 1, - EVO_LDAP = 2, - EVO_GWISE = 3 + EVO_LDAP = 2, + EVO_GWISE = 3 } sdbc_address_type; } - - typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding - + + typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding + class OEvoabConnection :public OConnection_BASE ,public connectivity::OSubComponent<OEvoabConnection, OConnection_BASE> { friend class connectivity::OSubComponent<OEvoabConnection, OConnection_BASE>; - private: + private: const OEvoabDriver& m_rDriver; SDBCAddress::sdbc_address_type m_eSDBCAddressType; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > @@ -80,18 +80,18 @@ namespace connectivity inline void setPassword( rtl::OString aStr ) { m_aPassword = aStr; } // own methods inline const OEvoabDriver& getDriver() const { return m_rDriver; } - + SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} void setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;} - + // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface virtual void SAL_CALL release() throw(); - + // XServiceInfo DECLARE_SERVICE_INFO(); - + // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -112,7 +112,7 @@ namespace connectivity virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + // XCloseable virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XWarningsSupplier diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 9112c5c0dba9..c6dc8bbf7afb 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.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 @@ -69,7 +69,7 @@ namespace connectivity static ColumnProperty **pFields=NULL; static guint nFields = 0; - static const char *pBlackList[] = + static const char *pBlackList[] = { "id", "list-show-addresses", @@ -89,11 +89,11 @@ namespace connectivity return evo_addr; } - static void + static void splitColumn (ColumnProperty **pToBeFields) { const SplitEvoColumns* evo_addr( get_evo_addr() ); - for (int i = 0; i < OTHER_ZIP; i++) + for (int i = 0; i < OTHER_ZIP; i++) { pToBeFields[nFields] = g_new0(ColumnProperty,1); pToBeFields[nFields]->bIsSplittedValue = true; @@ -135,7 +135,7 @@ namespace connectivity break; } } - if( bAdd ) + if( bAdd ) { pToBeFields[nFields]= g_new0(ColumnProperty,1); pToBeFields[nFields]->bIsSplittedValue=false; @@ -147,7 +147,7 @@ namespace connectivity break; } } - + splitColumn(pToBeFields); pFields = pToBeFields; } @@ -192,7 +192,7 @@ namespace connectivity guint findEvoabField(const rtl::OUString& aColName) { - guint nRet = (guint)-1; + guint nRet = (guint)-1; sal_Bool bFound = sal_False; initFields(); for (guint i=0;(i < nFields) && !bFound;i++) @@ -236,24 +236,24 @@ namespace connectivity return aName; } - void + void free_column_resources() { - for (int i=nFields-1;i > 0;i--) + for (int i=nFields-1;i > 0;i--) { - if (pFields && pFields[i] ) + if (pFields && pFields[i] ) { - if (pFields[i]->pField) + if (pFields[i]->pField) g_param_spec_unref(pFields[i]->pField); g_free(pFields[i]); } } - if(pFields) + if(pFields) { g_free(pFields); pFields=NULL; } - + } @@ -277,11 +277,11 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const static ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(19); aRows.clear(); - + // **************************************************** // Some entries in a row never change, so set them now // **************************************************** - + // Catalog aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("")); // Schema @@ -333,7 +333,7 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const return aRows ; } // ------------------------------------------------------------------------- -::rtl::OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) +::rtl::OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) { return ::rtl::OUString(); } @@ -393,7 +393,7 @@ sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLEx return 0;// 0 means no limit } // ------------------------------------------------------------------------- -sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw( ) +sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { // We only support a single table return 1; @@ -415,7 +415,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(S return sal_False; } // ------------------------------------------------------------------------- -sal_Bool OEvoabDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +sal_Bool OEvoabDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { return sal_False; } @@ -461,7 +461,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(S return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\""); @@ -1031,7 +1031,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw ODatabaseMetaDataResultSet::ORow aRow; aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); aRow.push_back(new ORowSetValueDecorator(sTableTypes[i])); - + // bound row aRows.push_back(aRow); } @@ -1042,8 +1042,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw // ------------------------------------------------------------------------- Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) { - /* - * Return the proper type information required by evo driver + /* + * Return the proper type information required by evo driver */ ODatabaseMetaDataResultSet* pResultSet = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo); @@ -1107,20 +1107,20 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; - + // check if any type is given // when no types are given then we have to return all tables e.g. TABLE - + const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE")); - + sal_Bool bTableFound = sal_True; sal_Int32 nLength = types.getLength(); if(nLength) { bTableFound = sal_False; - + const ::rtl::OUString* pBegin = types.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + nLength; + const ::rtl::OUString* pEnd = pBegin + nLength; for(;pBegin != pEnd;++pBegin) { if(*pBegin == aTable) @@ -1134,7 +1134,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( return xRef; ODatabaseMetaDataResultSet::ORows aRows; - + ESourceList *pSourceList; if( !e_book_get_addressbooks (&pSourceList, NULL) ) pSourceList = NULL; @@ -1149,17 +1149,17 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( case SDBCAddress::EVO_GWISE: if (0==strncmp( "groupwise://", p, 11 )) break; - else + else continue; case SDBCAddress::EVO_LOCAL: if (0==strncmp( "file://", p, 6 )) break; else continue; - case SDBCAddress::EVO_LDAP: + case SDBCAddress::EVO_LDAP: if (0==strncmp( "ldap://", p, 6 )) break; - else + else continue; case SDBCAddress::Unknown: break; diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index d6faab52665e..a0fe1788e29a 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.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 @@ -41,7 +41,7 @@ namespace connectivity { class EvoContacts; - + //************************************************************** //************ Class: OEvoabDatabaseMetaData //************************************************************** @@ -71,15 +71,15 @@ namespace connectivity rtl::OUString getFieldTypeName(guint nCol) ; rtl::OUString getFieldName(guint nCol) ; guint findEvoabField(const rtl::OUString& aColName); - + void free_column_resources(); class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase { - OEvoabConnection* m_pConnection; - + OEvoabConnection* m_pConnection; + ODatabaseMetaDataResultSet::ORows& getColumnRows( const ::rtl::OUString& columnNamePattern ); - + protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information @@ -98,11 +98,11 @@ namespace connectivity virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ); virtual ~OEvoabDatabaseMetaData(); - public: + public: inline OEvoabConnection* getOwnConnection() const { return m_pConnection; } - + OEvoabDatabaseMetaData(OEvoabConnection* _pCon); - + // as I mentioned before this interface is really BIG // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -126,10 +126,10 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx index 612bb9319437..92e360425b98 100644 --- a/connectivity/source/drivers/evoab2/NDebug.cxx +++ b/connectivity/source/drivers/evoab2/NDebug.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/source/drivers/evoab2/NDebug.hxx b/connectivity/source/drivers/evoab2/NDebug.hxx index e522c7873971..77f7269c82a1 100644 --- a/connectivity/source/drivers/evoab2/NDebug.hxx +++ b/connectivity/source/drivers/evoab2/NDebug.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 @@ -35,9 +35,9 @@ #ifdef DEBUG void evo_traceStringMessage( const sal_Char* pFormat, const ::rtl::OUString& rString ); -# define EVO_TRACE_STRING( pFormat, rString ) evo_traceStringMessage( pFormat, rString ) +# define EVO_TRACE_STRING( pFormat, rString ) evo_traceStringMessage( pFormat, rString ) #else -# define EVO_TRACE_STRING( pFormat, rString ) ((void)0) +# define EVO_TRACE_STRING( pFormat, rString ) ((void)0) #endif #endif // CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 5a71080036df..4b5cd5550d8d 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.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 @@ -67,13 +67,13 @@ OEvoabDriver::~OEvoabDriver() void OEvoabDriver::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - + // when driver will be destroied so all our connections have to be destroied as well for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i) { Reference< XComponent > xComp(i->get(), UNO_QUERY); if (xComp.is()) { - try { + try { xComp->dispose(); } catch (com::sun::star::lang::DisposedException e) { @@ -99,7 +99,7 @@ rtl::OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeExcept //------------------------------------------------------------------ Sequence< ::rtl::OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - // which service is supported + // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< ::rtl::OUString > aSNS( 1 ); aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver"); @@ -138,15 +138,15 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const ::rtl::OUString& ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) throw DisposedException(); - + if ( ! acceptsURL(url) ) return NULL; - + OEvoabConnection* pCon = new OEvoabConnection( *this ); pCon->construct(url,info); Reference< XConnection > xCon = pCon; m_xConnections.push_back(WeakReferenceHelper(*pCon)); - + return xCon; } // -------------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 2b9a2cf0f395..c8917bffa68d 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.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 @@ -35,66 +35,66 @@ #include "connectivity/CommonTools.hxx" #include <osl/module.h> -#define EVOAB_EVOLUTION_SCHEMA "evolution" +#define EVOAB_EVOLUTION_SCHEMA "evolution" /*In Future, when seperate schema is required for ldap, groupwise*/ -#define EVOAB_LDAP_SCHEMA "ldap" -#define EVOAB_GWISE_SCHEMA "groupwise" +#define EVOAB_LDAP_SCHEMA "ldap" +#define EVOAB_GWISE_SCHEMA "groupwise" -#define EVOAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.evoab.OEvoabDriver" +#define EVOAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.evoab.OEvoabDriver" namespace connectivity { namespace evoab { - + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - - - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, + + + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; - + class OEvoabDriver : public ODriver_BASE { - + protected: - ::osl::Mutex m_aMutex; - connectivity::OWeakRefArray m_xConnections; + ::osl::Mutex m_aMutex; + connectivity::OWeakRefArray m_xConnections; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; - + public: OEvoabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); virtual ~OEvoabDriver(); - + // OComponentHelper virtual void SAL_CALL disposing(void); - + // XInterface static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); - + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - - + + // XDriver virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); - + public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & getMSFactory(void) const { return m_xFactory; } - - // static methods + + // static methods static sal_Bool acceptsURL_Stat( const ::rtl::OUString& url ); }; } - + } #endif //_CONNECTIVITY_EVOAB_DRIVER_HXX_ diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 3f1ef4b572b6..1aadfbf031fe 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.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/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 1df469d0c8fb..af0e56729fe3 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.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 @@ -45,7 +45,7 @@ namespace connectivity { class OBoundParam; - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, ::com::sun::star::sdbc::XParameters, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::sdbc::XMultipleResults, @@ -57,27 +57,27 @@ namespace connectivity protected: struct Parameter { - ::com::sun::star::uno::Any aValue; - sal_Int32 nDataType; + ::com::sun::star::uno::Any aValue; + sal_Int32 nDataType; - Parameter(const ::com::sun::star::uno::Any& rValue, - sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) + Parameter(const ::com::sun::star::uno::Any& rValue, + sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) { } }; - ::std::vector< Parameter> m_aParameters; + ::std::vector< Parameter> m_aParameters; //==================================================================== // Data attributes //==================================================================== // our SQL statement - ::rtl::OUString m_sSqlStatement; + ::rtl::OUString m_sSqlStatement; // the EBookQuery we're working with QueryData m_aQueryData; // our meta data - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; protected: virtual ~OEvoabPreparedStatement(); diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 874b70d8a0ea..4bea08aab6d3 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.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 @@ -75,7 +75,7 @@ using namespace com::sun::star::io; namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition; //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \ +::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \ { return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.evoab.ResultSet"); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 36c1f7d359f0..0ffe5a7e5b86 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.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,15 +70,15 @@ namespace connectivity ,public ::comphelper::OPropertyContainer ,public ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet> { - + protected: OCommonStatement* m_pStatement; OEvoabConnection* m_pConnection; - ::com::sun::star::uno::WeakReferenceHelper m_aStatement; + ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; ::dbtools::WarningsContainer m_aWarnings; - + bool m_bWasNull; // <properties> sal_Int32 m_nFetchSize; @@ -88,7 +88,7 @@ namespace connectivity // </properties> // Data & iteration - GList *m_pContacts; + GList *m_pContacts; sal_Int32 m_nIndex; sal_Int32 m_nLength; EContact *getCur() @@ -101,22 +101,22 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); - + // you can't delete objects of this type virtual ~OEvoabResultSet(); public: DECLARE_SERVICE_INFO(); - + OEvoabResultSet( OCommonStatement *pStmt, OEvoabConnection *pConnection ); void construct( const QueryData& _rData ); OEvoabConnection * getConnection() { return m_pConnection; } - + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() { return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*(OResultSet_BASE*)this); } - + // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); // XInterface diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 2265fa0f72cd..ed727feb0727 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.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 @@ -40,7 +40,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; -OEvoabResultSetMetaData::OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName) +OEvoabResultSetMetaData::OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName) : m_aTableName(_aTableName), m_aEvoabFields() { @@ -117,7 +117,7 @@ sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnN ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; - const ColumnProperty *pSpecs = getField(nField); + const ColumnProperty *pSpecs = getField(nField); GParamSpec *pSpec = pSpecs->pField; rtl::OUString aLabel; diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index 29e432737dac..6906549dece9 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.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 @@ -26,8 +26,8 @@ * ************************************************************************/ -#ifndef _CONNECTIVITY_EVOAB_RESULTSETMETADATA_HXX_ -#define _CONNECTIVITY_EVOAB_RESULTSETMETADATA_HXX_ +#ifndef _CONNECTIVITY_EVOAB_RESULTSETMETADATA_HXX_ +#define _CONNECTIVITY_EVOAB_RESULTSETMETADATA_HXX_ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase1.hxx> @@ -43,7 +43,7 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; - class OEvoabResultSetMetaData : public OResultSetMetaData_BASE + class OEvoabResultSetMetaData : public OResultSetMetaData_BASE { ::rtl::OUString m_aTableName; ::std::vector<sal_Int32> m_aEvoabFields; @@ -55,12 +55,12 @@ namespace connectivity void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aEvoabFields[columnIndex - 1]; } - inline sal_Int32 getFieldSize() const + inline sal_Int32 getFieldSize() const {return m_aEvoabFields.size();} /// Avoid ambigous cast error from the compiler. inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() { return this; } - + virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index cfdce80a9885..e01013fdde1c 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.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 @@ -116,8 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index af914aae7e87..43bbaf2fcfa4 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.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 @@ -139,7 +139,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index d12956e96008..b5adfeb0a761 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.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 @@ -160,20 +160,20 @@ namespace connectivity ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created OEvoabResultSet *m_pResultSet; OEvoabConnection *m_pConnection; - connectivity::OSQLParser m_aParser; + connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode *m_pParseTree; // <properties> - ::rtl::OUString m_aCursorName; - sal_Int32 m_nMaxFieldSize; - sal_Int32 m_nMaxRows; - sal_Int32 m_nQueryTimeOut; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bEscapeProcessing; + ::rtl::OUString m_aCursorName; + sal_Int32 m_nMaxFieldSize; + sal_Int32 m_nMaxRows; + sal_Int32 m_nQueryTimeOut; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; + sal_Bool m_bEscapeProcessing; // </properties> ::cppu::OBroadcastHelper& rBHelper; diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index 3d4538401f65..30807ab4f50a 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.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/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx index 8843f5fc157c..169191d63032 100644 --- a/connectivity/source/drivers/evoab2/NTable.hxx +++ b/connectivity/source/drivers/evoab2/NTable.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,7 +46,7 @@ namespace connectivity OEvoabConnection* m_pConnection; public: - OEvoabTable( sdbcx::OCollection* _pTables, + OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index 88bce2c7d869..a41d13db5a2a 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.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/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 8654eb83997d..001454a18dd3 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.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/source/drivers/evoab2/evoab.xml b/connectivity/source/drivers/evoab2/evoab.xml index f0abcc963b8d..fbf309cbf03c 100644 --- a/connectivity/source/drivers/evoab2/evoab.xml +++ b/connectivity/source/drivers/evoab2/evoab.xml @@ -11,7 +11,7 @@ <language>c++</language> <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> - <service-dependency> ... </service-dependency> + <service-dependency> ... </service-dependency> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> diff --git a/connectivity/source/drivers/evoab2/evoab2.xcu b/connectivity/source/drivers/evoab2/evoab2.xcu index a7c81d9c75e8..bda1fb8648f9 100755 --- a/connectivity/source/drivers/evoab2/evoab2.xcu +++ b/connectivity/source/drivers/evoab2/evoab2.xcu @@ -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,7 +49,7 @@ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> <value xml:lang="en-US">Evolution LDAP</value> </prop> - <node oor:name="Features"> + <node oor:name="Features"> <node oor:name="EscapeDateTime" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index fbf54140dc34..5144486ac51b 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.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 @@ -102,13 +102,13 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException) Sequence< Type > aTypes = OFileCatalog_BASE::getTypes(); ::std::vector<Type> aOwnTypes; - aOwnTypes.reserve(aTypes.getLength()); + aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) { - if(!(*pBegin == ::getCppuType((const Reference<XGroupsSupplier>*)0) || - *pBegin == ::getCppuType((const Reference<XUsersSupplier>*)0) || + if(!(*pBegin == ::getCppuType((const Reference<XGroupsSupplier>*)0) || + *pBegin == ::getCppuType((const Reference<XUsersSupplier>*)0) || *pBegin == ::getCppuType((const Reference<XViewsSupplier>*)0))) { aOwnTypes.push_back(*pBegin); diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx index b1f08c38db98..fb25c29700ea 100644 --- a/connectivity/source/drivers/file/FColumns.cxx +++ b/connectivity/source/drivers/file/FColumns.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/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 14ce3ddf5841..4d2df42be6c1 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.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 @@ -64,7 +64,7 @@ using namespace ::ucbhelper; using rtl::OUString; typedef connectivity::OMetaConnection OConnection_BASE; // -------------------------------------------------------------------------------- -OConnection::OConnection(OFileDriver* _pDriver) +OConnection::OConnection(OFileDriver* _pDriver) : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) ,m_pDriver(_pDriver) ,m_bClosed(sal_False) @@ -380,10 +380,10 @@ void OConnection::disposing() ::osl::MutexGuard aGuard(m_aMutex); OConnection_BASE::disposing(); - m_bClosed = sal_True; + m_bClosed = sal_True; m_xDir.clear(); m_xContent.clear(); - m_xCatalog = WeakReference< XTablesSupplier>(); + m_xCatalog = WeakReference< XTablesSupplier>(); dispose_ChildImpl(); } diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index 91443bab7ed8..470ad0c6fdfe 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.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 @@ -206,7 +206,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( bTableFound = sal_False; const ::rtl::OUString* pBegin = types.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + nLength; + const ::rtl::OUString* pEnd = pBegin + nLength; for(;pBegin != pEnd;++pBegin) { if(*pBegin == aTable) @@ -400,7 +400,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLExcepti return 0; } // ------------------------------------------------------------------------- -sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) +sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_getMaxTablesInSelect_throw" ); return 1; @@ -418,10 +418,10 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XTablesSupplier > xTabSup = m_pConnection->createCatalog(); - if( xTabSup.is()) + if( xTabSup.is()) { - Reference< XNameAccess> xNames = xTabSup->getTables(); - Sequence< ::rtl::OUString > aNames = xNames->getElementNames(); + Reference< XNameAccess> xNames = xTabSup->getTables(); + Sequence< ::rtl::OUString > aNames = xNames->getElementNames(); const ::rtl::OUString* pBegin = aNames.getConstArray(); const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); for(;pBegin != pEnd;++pBegin) @@ -494,7 +494,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLExc return sal_False; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw" ); return sal_False; @@ -567,7 +567,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) return sal_True; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) +sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_isCatalogAtStart_throw" ); return sal_True; diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx index 792cb2d8bddb..a7a1bcc4d7aa 100644 --- a/connectivity/source/drivers/file/FDateFunctions.cxx +++ b/connectivity/source/drivers/file/FDateFunctions.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 @@ -41,7 +41,7 @@ ORowSetValue OOp_DayOfWeek::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + sal_Int32 nRet = 0; ::com::sun::star::util::Date aD = lhs; Date aDate(aD.Day,aD.Month,aD.Year); @@ -79,7 +79,7 @@ ORowSetValue OOp_DayOfMonth::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + ::com::sun::star::util::Date aD = lhs; return static_cast<sal_Int16>(aD.Day); } @@ -88,7 +88,7 @@ ORowSetValue OOp_DayOfYear::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + ::com::sun::star::util::Date aD = lhs; Date aDate(aD.Day,aD.Month,aD.Year); return static_cast<sal_Int16>(aDate.GetDayOfYear()); @@ -98,7 +98,7 @@ ORowSetValue OOp_Month::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + ::com::sun::star::util::Date aD = lhs; return static_cast<sal_Int16>(aD.Month); } @@ -107,7 +107,7 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + ::rtl::OUString sRet; ::com::sun::star::util::Date aD = lhs; Date aDate(aD.Day,aD.Month,aD.Year); @@ -145,7 +145,7 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + ::rtl::OUString sRet; ::com::sun::star::util::Date aD = lhs; switch(aD.Month) @@ -194,7 +194,7 @@ ORowSetValue OOp_Quarter::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + sal_Int32 nRet = 1; ::com::sun::star::util::Date aD = lhs; Date aDate(aD.Day,aD.Month,aD.Year); @@ -216,7 +216,7 @@ ORowSetValue OOp_Week::operate(const ::std::vector<ORowSetValue>& lhs) const ::com::sun::star::util::Date aD = lhs[nSize-1]; Date aDate(aD.Day,aD.Month,aD.Year); - + sal_Int16 nStartDay = SUNDAY; if ( nSize == 2 && !lhs[0].isNull() ) nStartDay = lhs[0]; @@ -228,7 +228,7 @@ ORowSetValue OOp_Year::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + ::com::sun::star::util::Date aD = lhs; return static_cast<sal_Int16>(aD.Year); } @@ -237,7 +237,7 @@ ORowSetValue OOp_Hour::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + ::com::sun::star::util::Time aT = lhs; return static_cast<sal_Int16>(aT.Hours); } @@ -246,7 +246,7 @@ ORowSetValue OOp_Minute::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + ::com::sun::star::util::Time aT = lhs; return static_cast<sal_Int16>(aT.Minutes); } @@ -255,7 +255,7 @@ ORowSetValue OOp_Second::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + ::com::sun::star::util::Time aT = lhs; return static_cast<sal_Int16>(aT.Seconds); } @@ -264,7 +264,7 @@ ORowSetValue OOp_CurDate::operate(const ::std::vector<ORowSetValue>& lhs) const { if ( !lhs.empty() ) return ORowSetValue(); - + Date aCurDate; return ::com::sun::star::util::Date(aCurDate.GetDay(),aCurDate.GetMonth(),aCurDate.GetYear()); } @@ -273,7 +273,7 @@ ORowSetValue OOp_CurTime::operate(const ::std::vector<ORowSetValue>& lhs) const { if ( !lhs.empty() ) return ORowSetValue(); - + Time aCurTime; return ::com::sun::star::util::Time(aCurTime.Get100Sec(),aCurTime.GetSec(),aCurTime.GetMin(),aCurTime.GetHour()); } @@ -282,7 +282,7 @@ ORowSetValue OOp_Now::operate(const ::std::vector<ORowSetValue>& lhs) const { if ( !lhs.empty() ) return ORowSetValue(); - + DateTime aCurTime; return ::com::sun::star::util::DateTime(aCurTime.Get100Sec(),aCurTime.GetSec(),aCurTime.GetMin(),aCurTime.GetHour(), aCurTime.GetDay(),aCurTime.GetMonth(),aCurTime.GetYear()); diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index c41a839c3fef..f04bd3f4890f 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.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/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx index cf1b32c4edc3..e092fb5ce83a 100644 --- a/connectivity/source/drivers/file/FNoException.cxx +++ b/connectivity/source/drivers/file/FNoException.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 @@ -56,7 +56,7 @@ OPredicateInterpreter::~OPredicateInterpreter() delete m_aStack.top(); m_aStack.pop(); } - // m_aStack.clear(); + // m_aStack.clear(); } // ----------------------------------------------------------------------------- void OPredicateCompiler::Clean() @@ -75,7 +75,7 @@ void OSQLAnalyzer::clean() // ----------------------------------------------------------------------------- void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow) { - OCodeList& rCodeList = m_aCompiler->m_aCodeList; + OCodeList& rCodeList = m_aCompiler->m_aCodeList; for(OCodeList::iterator aIter = rCodeList.begin(); aIter != rCodeList.end();++aIter) { OOperandParam* pParam = PTR_CAST(OOperandParam,(*aIter)); diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx index 031905a01999..7800eb6b682f 100644 --- a/connectivity/source/drivers/file/FNumericFunctions.cxx +++ b/connectivity/source/drivers/file/FNumericFunctions.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 @@ -40,7 +40,7 @@ ORowSetValue OOp_Abs::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + double nVal(lhs); if ( nVal < 0 ) nVal *= -1.0; @@ -51,14 +51,14 @@ ORowSetValue OOp_Sign::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + sal_Int32 nRet = 0; double nVal(lhs); if ( nVal < 0 ) nRet = -1; else if ( nVal > 0 ) nRet = 1; - + return nRet; } //------------------------------------------------------------------ @@ -74,7 +74,7 @@ ORowSetValue OOp_Floor::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + return floor((double)lhs); } // ----------------------------------------------------------------------------- @@ -82,7 +82,7 @@ ORowSetValue OOp_Ceiling::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + double nVal(lhs); return ceil(nVal); } @@ -105,7 +105,7 @@ ORowSetValue OOp_Exp::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + double nVal(lhs); return exp(nVal); } @@ -114,7 +114,7 @@ ORowSetValue OOp_Ln::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() || static_cast<double>(lhs) < 0.0 ) return lhs; - + double nVal(lhs); nVal = log(nVal); if ( rtl::math::isNan(nVal) ) @@ -128,7 +128,7 @@ ORowSetValue OOp_Log::operate(const ::std::vector<ORowSetValue>& lhs) const return ORowSetValue(); size_t nSize = lhs.size(); double nVal = log( (double)lhs[nSize-1] ); - + if ( nSize == 2 && !lhs[0].isNull() ) nVal /= log((double)lhs[0]); @@ -142,7 +142,7 @@ ORowSetValue OOp_Log10::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() || static_cast<double>(lhs) < 0.0 ) return lhs; - + double nVal = log((double)lhs); if ( rtl::math::isNan(nVal) ) return ORowSetValue(); @@ -162,7 +162,7 @@ ORowSetValue OOp_Sqrt::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + double nVal = sqrt((double)lhs); if ( rtl::math::isNan(nVal) ) return ORowSetValue(); @@ -178,7 +178,7 @@ ORowSetValue OOp_Cos::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + return cos((double)lhs); } // ----------------------------------------------------------------------------- @@ -186,7 +186,7 @@ ORowSetValue OOp_Sin::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + return sin((double)lhs); } // ----------------------------------------------------------------------------- @@ -194,7 +194,7 @@ ORowSetValue OOp_Tan::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + return tan((double)lhs); } // ----------------------------------------------------------------------------- @@ -202,7 +202,7 @@ ORowSetValue OOp_ACos::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + return acos((double)lhs); } // ----------------------------------------------------------------------------- @@ -210,7 +210,7 @@ ORowSetValue OOp_ASin::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + return asin((double)lhs); } // ----------------------------------------------------------------------------- @@ -218,7 +218,7 @@ ORowSetValue OOp_ATan::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + return atan((double)lhs); } // ----------------------------------------------------------------------------- @@ -234,7 +234,7 @@ ORowSetValue OOp_Degrees::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + double nLhs = lhs; return nLhs*180*(1.0/3.141592653589793116); } @@ -243,7 +243,7 @@ ORowSetValue OOp_Radians::operate(const ORowSetValue& lhs) const { if ( lhs.isNull() ) return lhs; - + double nLhs = lhs; return nLhs*3.141592653589793116*(1.0/180.0); } diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index cb3fb1f78445..700a8b9a6940 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.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 @@ -139,7 +139,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::queryInterface" ); Any aRet = OStatement_BASE2::queryInterface(rType); - return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, + return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, static_cast< XPreparedStatement*>(this), static_cast< XParameters*>(this), static_cast< XResultSetMetaDataSupplier*>(this)); @@ -368,7 +368,7 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any ) ); ::dbtools::throwGenericSQLException(sError,*this); } - // setObject (parameterIndex, x, sqlType, 0); + // setObject (parameterIndex, x, sqlType, 0); } // ------------------------------------------------------------------------- @@ -502,11 +502,11 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere // Typ, Precision, Scale ... der angegebenen Column verwenden, // denn dieser Column wird der Wert zugewiesen bzw. mit dieser // Column wird der Wert verglichen. - _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= eType; - _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nPrecision; - _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale; - _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNullable; - _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sParameterName; + _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= eType; + _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nPrecision; + _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale; + _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNullable; + _xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sParameterName; } Reference<XPropertySet> xParaColumn = new connectivity::parse::OParseColumn(sParameterName @@ -540,8 +540,8 @@ void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode AddParameter(_pParameter,xProp); } } - // else - // AddParameter(_pParameter,xProp); + // else + // AddParameter(_pParameter,xProp); } // ------------------------------------------------------------------------- void OPreparedStatement::describeParameter() @@ -551,7 +551,7 @@ void OPreparedStatement::describeParameter() scanParameter(m_pParseTree,aParseNodes); if ( !aParseNodes.empty() ) { - // m_xParamColumns = new OSQLColumns(); + // m_xParamColumns = new OSQLColumns(); const OSQLTables& xTabs = m_aSQLIterator.getTables(); if( !xTabs.empty() ) { @@ -585,12 +585,12 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult) { UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j); if (nParameter == SQL_NO_PARAMETER) - continue; // dieser AssignValue ist kein Parameter + continue; // dieser AssignValue ist kein Parameter ++nParaCount; // ab hier ist der Parameter gueltig // Parameter ersetzen. Wenn Parameter nicht verfuegbar, - // Value auf NULL setzen. - // (*m_aAssignValues)[j] = (*m_aParameterRow)[(UINT16)nParameter]; + // Value auf NULL setzen. + // (*m_aAssignValues)[j] = (*m_aParameterRow)[(UINT16)nParameter]; } if (m_aParameterRow.is() && (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() ) diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 054fe31424b8..72736cf0b836 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.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 @@ -77,7 +77,7 @@ using namespace com::sun::star::container; // Maximale Anzahl von Rows, die mit ORDER BY sortiert durchlaufen werden koennen: #if defined (WIN) -#define MAX_KEYSET_SIZE 0x3ff0 // Etwas weniger als ein Segment, damit +#define MAX_KEYSET_SIZE 0x3ff0 // Etwas weniger als ein Segment, damit // noch Platz fuer Memory Debug-Informationen #else #define MAX_KEYSET_SIZE 0x40000 // 256K @@ -96,7 +96,7 @@ namespace IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.drivers.file.ResultSet","com.sun.star.sdbc.ResultSet"); DBG_NAME( file_OResultSet ) // ------------------------------------------------------------------------- -OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIterator) : OResultSet_BASE(m_aMutex) +OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIterator) : OResultSet_BASE(m_aMutex) ,::comphelper::OPropertyContainer(OResultSet_BASE::rBHelper) ,m_aAssignValues(NULL) ,m_pEvaluationKeySet(NULL) @@ -134,11 +134,11 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator& _aSQLIte RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::OResultSet" ); DBG_CTOR( file_OResultSet, NULL ); osl_incrementInterlockedCount( &m_refCount ); - m_bIsCount = (m_pParseTree && - m_pParseTree->count() > 2 && - SQL_ISRULE(m_pParseTree->getChild(2),scalar_exp_commalist) && - SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0),derived_column) && - SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0)->getChild(0),general_set_fct) && + m_bIsCount = (m_pParseTree && + m_pParseTree->count() > 2 && + SQL_ISRULE(m_pParseTree->getChild(2),scalar_exp_commalist) && + SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0),derived_column) && + SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0)->getChild(0),general_set_fct) && m_pParseTree->getChild(2)->getChild(0)->getChild(0)->count() == 4 ); @@ -160,9 +160,9 @@ OResultSet::~OResultSet() void OResultSet::construct() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::construct" ); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); } // ------------------------------------------------------------------------- @@ -174,7 +174,7 @@ void OResultSet::disposing(void) ::osl::MutexGuard aGuard(m_aMutex); m_xStatement.clear(); m_xMetaData.clear(); - m_pParseTree = NULL; + m_pParseTree = NULL; m_xColNames.clear(); m_xColumns = NULL; m_xParamColumns = NULL; @@ -215,7 +215,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException) //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::getTypes" ); ::osl::MutexGuard aGuard( m_aMutex ); - OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -258,7 +258,7 @@ void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::checkIndex" ); if ( columnIndex <= 0 - // || columnIndex > (sal_Int32)m_xColumns->size() + // || columnIndex > (sal_Int32)m_xColumns->size() || columnIndex >= m_nColumnCount ) ::dbtools::throwInvalidIndexException(*this); } @@ -541,7 +541,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) -{ ::osl::MutexGuard aGuard( m_aMutex ); +{ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -671,7 +671,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) if(!m_pTable || m_pTable->isReadOnly()) lcl_throwError(STR_TABLE_READONLY,*this); - + m_bRowUpdated = m_pTable->UpdateRow(*m_aInsertRow, m_aRow,m_xColsIdx); *(m_aInsertRow->get())[0] = (sal_Int32)(m_aRow->get())[0]->getValue(); @@ -709,10 +709,10 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - m_bInserted = sal_False; - m_bRowUpdated = sal_False; - m_bRowInserted = sal_False; - m_bRowDeleted = sal_False; + m_bInserted = sal_False; + m_bRowUpdated = sal_False; + m_bRowInserted = sal_False; + m_bRowDeleted = sal_False; if(m_aInsertRow.is()) { @@ -735,7 +735,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti if(!m_pTable || m_pTable->isReadOnly()) lcl_throwError(STR_TABLE_READONLY,*this); - m_bInserted = sal_True; + m_bInserted = sal_True; OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1; for(;aIter != m_aInsertRow->get().end();++aIter) @@ -935,7 +935,7 @@ again: return sal_False; } - if (!bEvaluate) // Laeuft keine Auswertung, dann nur Ergebniszeile fuellen + if (!bEvaluate) // Laeuft keine Auswertung, dann nur Ergebniszeile fuellen { m_pTable->fetchRow(m_aRow,rTableCols, sal_True,bRetrieveData); } @@ -943,10 +943,10 @@ again: { m_pTable->fetchRow(m_aEvaluateRow, rTableCols, sal_True,bRetrieveData || bHasRestriction); - if ( (!m_bShowDeleted && m_aEvaluateRow->isDeleted()) + if ( (!m_bShowDeleted && m_aEvaluateRow->isDeleted()) || (bHasRestriction && //!bShowDeleted && m_aEvaluateRow->isDeleted() ||// keine Anzeige von geloeschten Saetzen - !m_pSQLAnalyzer->evaluateRestriction())) // Auswerten der Bedingungen - { // naechsten Satz auswerten + !m_pSQLAnalyzer->evaluateRestriction())) // Auswerten der Bedingungen + { // naechsten Satz auswerten // aktuelle Zeile loeschen im Keyset if (m_pEvaluationKeySet) { @@ -984,7 +984,7 @@ again: } else { - // aStatus.Set(SQL_STAT_NO_DATA_FOUND); + // aStatus.Set(SQL_STAT_NO_DATA_FOUND); return sal_False; } // Nochmal probieren ... @@ -993,7 +993,7 @@ again: } // Evaluate darf nur gesetzt sein, - // wenn der Keyset weiter aufgebaut werden soll + // wenn der Keyset weiter aufgebaut werden soll if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT && !isCount() && (m_pFileSet.is() || m_pSortIndex) && bEvaluate) { @@ -1004,7 +1004,7 @@ again: } else if (m_pFileSet.is()) { - // OSL_ENSURE(!m_pFileSet->IsFrozen() , "Falsche CursorPosition!"); + // OSL_ENSURE(!m_pFileSet->IsFrozen() , "Falsche CursorPosition!"); sal_uInt32 nBookmarkValue = Abs((sal_Int32)(m_aEvaluateRow->get())[0]->getValue()); m_pFileSet->get().push_back(nBookmarkValue); } @@ -1096,7 +1096,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, // b.) Ein KeySet besteht und m_nRowPos > m_pFileSet->size() if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (INT32)m_pFileSet->get().size() )) // && m_pFileSet->IsFrozen() { - // aStatus.Set(SQL_STAT_NO_DATA_FOUND); + // aStatus.Set(SQL_STAT_NO_DATA_FOUND); goto Error; } else @@ -1119,7 +1119,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, if (!m_pFileSet->get().empty()) { m_aFileSetIter = m_pFileSet->get().end()-1; - // m_pFileSet->SeekPos(m_pFileSet->size()-1); + // m_pFileSet->SeekPos(m_pFileSet->size()-1); m_pTable->seekRow(IResultSetHelper::BOOKMARK, *m_aFileSetIter, m_nFilePos); } sal_Bool bOK = sal_True; @@ -1130,7 +1130,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, { if (m_nRowPos >= (INT32)m_pEvaluationKeySet->size()) return sal_False; - // aStatus.Set(SQL_STAT_NO_DATA_FOUND); + // aStatus.Set(SQL_STAT_NO_DATA_FOUND); else if (m_nRowPos == 0) { m_aEvaluateIter = m_pEvaluationKeySet->begin(); @@ -1159,14 +1159,14 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); } } - else if (!m_pFileSet->isFrozen()) // keinen gueltigen Satz gefunden + else if (!m_pFileSet->isFrozen()) // keinen gueltigen Satz gefunden { //m_pFileSet->Freeze(); m_pFileSet->setFrozen(); - // DELETEZ(m_pEvaluationKeySet); + // DELETEZ(m_pEvaluationKeySet); m_pEvaluationKeySet = NULL; - // aStatus.Set(SQL_STAT_NO_DATA_FOUND); + // aStatus.Set(SQL_STAT_NO_DATA_FOUND); goto Error; } } @@ -1249,12 +1249,12 @@ Error: m_nRowPos = -1; break; case IResultSetHelper::BOOKMARK: - m_nRowPos = nTempPos; // vorherige Position + m_nRowPos = nTempPos; // vorherige Position } } - // delete pGuard; + // delete pGuard; // rMode = (!bShowDeleted && aStatus.IsSuccessful() && m_aRow->isDeleted()) ? // keine Anzeige von geloeschten Saetzen - // OCursor::SQL_MOD_INVALID : OCursor::SQL_MOD_NONE; + // OCursor::SQL_MOD_INVALID : OCursor::SQL_MOD_NONE; return sal_False; } // ------------------------------------------------------------------------- @@ -1267,7 +1267,7 @@ void OResultSet::sortRows() // Und diese Feld ist indiziert, dann den Index ausnutzen Reference<XIndexesSupplier> xIndexSup; m_pTable->queryInterface(::getCppuType((const Reference<XIndexesSupplier>*)0)) >>= xIndexSup; - // Reference<XIndexesSupplier> xIndexSup(m_pTable,UNO_QUERY); + // Reference<XIndexesSupplier> xIndexSup(m_pTable,UNO_QUERY); Reference<XIndexAccess> xIndexes; if(xIndexSup.is()) { @@ -1293,7 +1293,7 @@ void OResultSet::sortRows() } } } - + OSortIndex::TKeyTypeVector eKeyType(m_aOrderbyColumnNumber.size()); ::std::vector<sal_Int32>::iterator aOrderByIter = m_aOrderbyColumnNumber.begin(); for (::std::vector<sal_Int16>::size_type i=0;aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i) @@ -1330,13 +1330,13 @@ void OResultSet::sortRows() } (m_aEvaluateRow->get())[*aOrderByIter]->setBound(sal_True); } - + m_pSortIndex = new OSortIndex(eKeyType,m_aOrderbyAscending); if (m_pEvaluationKeySet) { m_aEvaluateIter = m_pEvaluationKeySet->begin(); - + while (m_aEvaluateIter != m_pEvaluationKeySet->end()) { ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE); @@ -1349,14 +1349,14 @@ void OResultSet::sortRows() { } } - + // Sortiertes Keyset erzeugen - // DELETEZ(m_pEvaluationKeySet); + // DELETEZ(m_pEvaluationKeySet); m_pEvaluationKeySet = NULL; m_pFileSet = NULL; m_pFileSet = m_pSortIndex->CreateKeySet(); - // if(!bDistinct) - // SetRowCount(pFileSet->count()); + // if(!bDistinct) + // SetRowCount(pFileSet->count()); DELETEZ(m_pSortIndex); // Nun kann ueber den Index sortiert zugegriffen werden. } @@ -1372,7 +1372,7 @@ BOOL OResultSet::OpenImpl() const OSQLTables& xTabs = m_aSQLIterator.getTables(); if ((xTabs.begin() == xTabs.end()) || !xTabs.begin()->second.is()) lcl_throwError(STR_QUERY_TOO_COMPLEX,*this); - + if ( xTabs.size() > 1 || m_aSQLIterator.hasErrors() ) lcl_throwError(STR_QUERY_MORE_TABLES,*this); @@ -1400,7 +1400,7 @@ BOOL OResultSet::OpenImpl() // Neuen Index aufbauen: m_pFileSet = NULL; - // DELETEZ(m_pEvaluationKeySet); + // DELETEZ(m_pEvaluationKeySet); // An den Anfang positionieren m_nRowPos = -1; @@ -1417,7 +1417,7 @@ BOOL OResultSet::OpenImpl() { if(m_xColumns->get().size() > 1) lcl_throwError(STR_QUERY_COMPLEX_COUNT,*this); - + m_nRowCountResult = 0; // Vorlaeufig einfach ueber alle Datensaetze iterieren und // dabei die Aktionen bearbeiten (bzw. einfach nur zaehlen): @@ -1451,7 +1451,7 @@ BOOL OResultSet::OpenImpl() // nRowCount, also die Anzahl der Rows in der Ergebnismenge, ist bei dieser // Anfrage = 1! m_pEvaluationKeySet = NULL; - // DELETEZ(m_pEvaluationKeySet); + // DELETEZ(m_pEvaluationKeySet); } } else @@ -1459,9 +1459,9 @@ BOOL OResultSet::OpenImpl() BOOL bDistinct = FALSE; BOOL bWasSorted = FALSE; OSQLParseNode *pDistinct = m_pParseTree->getChild(1); - ::std::vector<sal_Int32> aOrderbyColumnNumberSave; + ::std::vector<sal_Int32> aOrderbyColumnNumberSave; ::std::vector<TAscendingOrder> aOrderbyAscendingSave; - + if (pDistinct && pDistinct->getTokenID() == SQL_TOKEN_DISTINCT ) { // Sort on all columns, saving original order for later @@ -1472,11 +1472,11 @@ BOOL OResultSet::OpenImpl() aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(), m_aOrderbyAscending.end()); bWasSorted = TRUE; } - + // the first column is the bookmark column ::std::vector<sal_Int32>::iterator aColStart = (m_aColMapping.begin()+1); ::std::copy(aColStart, m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber)); -// m_aOrderbyColumnNumber.assign(aColStart, m_aColMapping.end()); +// m_aOrderbyColumnNumber.assign(aColStart, m_aColMapping.end()); m_aOrderbyAscending.assign(m_aColMapping.size()-1, SQL_ASC); bDistinct = TRUE; } @@ -1500,19 +1500,19 @@ BOOL OResultSet::OpenImpl() } } OSL_ENSURE(m_pFileSet.is(),"Kein KeySet vorhanden! :-("); - + if(bDistinct && m_pFileSet.is()) // sicher ist sicher { OValueRow aSearchRow = new OValueVector(m_aRow->get().size()); OValueRefVector::Vector::iterator aRowIter = m_aRow->get().begin(); OValueVector::Vector::iterator aSearchIter = aSearchRow->get().begin(); - for ( ++aRowIter,++aSearchIter; // the first column is the bookmark column + for ( ++aRowIter,++aSearchIter; // the first column is the bookmark column aRowIter != m_aRow->get().end(); ++aRowIter,++aSearchIter) aSearchIter->setBound((*aRowIter)->isBound()); size_t nMaxRow = m_pFileSet->get().size(); - + if (nMaxRow) { #if OSL_DEBUG_LEVEL > 1 @@ -1520,16 +1520,16 @@ BOOL OResultSet::OpenImpl() #endif INT32 nPos; INT32 nKey; - + for( size_t j = nMaxRow-1; j > 0; --j) { - nPos = (m_pFileSet->get())[j]; + nPos = (m_pFileSet->get())[j]; ExecuteRow(IResultSetHelper::BOOKMARK,nPos,FALSE); m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); { // copy row values OValueRefVector::Vector::iterator copyFrom = m_aSelectRow->get().begin(); OValueVector::Vector::iterator copyTo = aSearchRow->get().begin(); - for ( ++copyFrom,++copyTo; // the first column is the bookmark column + for ( ++copyFrom,++copyTo; // the first column is the bookmark column copyFrom != m_aSelectRow->get().end(); ++copyFrom,++copyTo) *copyTo = *(*copyFrom); @@ -1542,14 +1542,14 @@ BOOL OResultSet::OpenImpl() m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); OValueRefVector::Vector::iterator loopInRow = m_aSelectRow->get().begin(); OValueVector::Vector::iterator existentInSearchRow = aSearchRow->get().begin(); - for ( ++loopInRow,++existentInSearchRow; // the first column is the bookmark column + for ( ++loopInRow,++existentInSearchRow; // the first column is the bookmark column loopInRow != m_aSelectRow->get().end(); ++loopInRow,++existentInSearchRow) { if ( (*loopInRow)->isBound() && !( *(*loopInRow) == *existentInSearchRow) ) break; } - + if(loopInRow == m_aSelectRow->get().end()) (m_pFileSet->get())[j] = 0; // Rows match -- Mark for deletion by setting key to 0 #if OSL_DEBUG_LEVEL > 1 @@ -1567,7 +1567,7 @@ BOOL OResultSet::OpenImpl() // Re-sort on original requested order m_aOrderbyColumnNumber = aOrderbyColumnNumberSave; m_aOrderbyAscending.assign(aOrderbyAscendingSave.begin(), aOrderbyAscendingSave.end()); - + TIntVector aEvaluationKeySet(m_pFileSet->get()); m_pEvaluationKeySet = &aEvaluationKeySet; sortRows(); @@ -1579,10 +1579,10 @@ BOOL OResultSet::OpenImpl() ::std::sort(m_pFileSet->get().begin(),m_pFileSet->get().end()); } } - // SetRowCount(m_pFileSet->count()); + // SetRowCount(m_pFileSet->count()); } } - } break; + } break; case SQL_STATEMENT_UPDATE: case SQL_STATEMENT_DELETE: @@ -1620,10 +1620,10 @@ BOOL OResultSet::OpenImpl() // Ergebnis von COUNT(*) in nRowCountResult merken. // nRowCount, also die Anzahl der Rows in der Ergebnismenge, ist bei dieser // Anfrage = 1! - // DELETEZ(m_pEvaluationKeySet); + // DELETEZ(m_pEvaluationKeySet); m_pEvaluationKeySet = NULL; } - // SetRowCount(1); + // SetRowCount(1); break; case SQL_STATEMENT_INSERT: m_nRowCountResult = 0; @@ -1688,14 +1688,14 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, Reference<XPropertySet> xTableColumn; ::rtl::OUString sTableColumnName, sSelectColumnRealName; - const ::rtl::OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); - const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); - const ::rtl::OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); + const ::rtl::OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); + const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); + const ::rtl::OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); typedef ::std::map<OSQLColumns::Vector::iterator,sal_Bool> IterMap; IterMap aSelectIters; OValueRefVector::Vector::iterator aRowIter = _rRow->get().begin()+1; - for (sal_Int32 i=0; // the first column is the bookmark column + for (sal_Int32 i=0; // the first column is the bookmark column aRowIter != _rRow->get().end(); ++i, ++aRowIter ) @@ -1713,7 +1713,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, // look if we have such a select column // TODO: would like to have a O(log n) search here ... - for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); + for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); aIter != _rxColumns->get().end(); ++aIter ) @@ -1757,7 +1757,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, Reference<XNameAccess> xNameAccess(_xNames,UNO_QUERY); Sequence< ::rtl::OUString > aSelectColumns = xNameAccess->getElementNames(); - for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); + for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); aIter != _rxColumns->get().end(); ++aIter ) @@ -1774,7 +1774,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, aSelectIters.insert(IterMap::value_type(aIter,sal_True)); sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1; const ::rtl::OUString* pBegin = aSelectColumns.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aSelectColumns.getLength(); + const ::rtl::OUString* pEnd = pBegin + aSelectColumns.getLength(); for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i) { if ( aCase(*pBegin, sSelectColumnRealName) ) @@ -1845,7 +1845,7 @@ void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::initializeRow" ); if(!_rRow.is()) { - _rRow = new OValueRefVector(_nColumnCount); + _rRow = new OValueRefVector(_nColumnCount); (_rRow->get())[0]->setBound(sal_True); ::std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetRefBound(sal_False)); } @@ -1884,7 +1884,7 @@ sal_Bool OResultSet::isRowDeleted() const void SAL_CALL OResultSet::disposing( const EventObject& Source ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::disposing" ); - // Reference<XInterface> xInt = m_pTable; + // Reference<XInterface> xInt = m_pTable; Reference<XPropertySet> xProp = m_pTable; if(m_pTable && Source.Source == xProp) { diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index 6d75d6f67357..fc45a15afb99 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.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 @@ -47,7 +47,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable) +OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable) :m_aTableName(_aTableName) ,m_xColumns(_rxColumns) ,m_pTable(_pTable) diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 0d504a71d2be..1ccb031bba5f 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.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 @@ -95,16 +95,16 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) sal_Int32 nAttrib = 0; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),PROPERTY_ID_ESCAPEPROCESSING, nAttrib,&m_bEscapeProcessing,::getCppuBooleanType()); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),PROPERTY_ID_ESCAPEPROCESSING, nAttrib,&m_bEscapeProcessing,::getCppuBooleanType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); } // ----------------------------------------------------------------------------- OStatement_Base::~OStatement_Base() @@ -216,7 +216,7 @@ void OStatement_Base::reset() throw (SQLException) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::reset" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - + clearWarnings (); @@ -233,7 +233,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::clearMyResultSet " ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - + try { Reference<XCloseable> xCloseable; @@ -254,7 +254,7 @@ void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::setWarning " ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - + m_aLastWarning = ex; } @@ -265,7 +265,7 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::getWarnings" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - + return makeAny(m_aLastWarning); } // ------------------------------------------------------------------------- @@ -326,7 +326,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - + construct(sql); Reference< XResultSet > xRS; OResultSet* pResult = createResultSet(); @@ -335,7 +335,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString m_xResultSet = Reference<XResultSet>(pResult); pResult->OpenImpl(); - + return xRS; } // ------------------------------------------------------------------------- @@ -348,14 +348,14 @@ sal_Int32 SAL_CALL OStatement::executeUpdate( const ::rtl::OUString& sql ) throw { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - + construct(sql); OResultSet* pResult = createResultSet(); Reference< XResultSet > xRS = pResult; initializeResultSet(pResult); pResult->OpenImpl(); - + return pResult->getRowCountResult(); } @@ -421,7 +421,7 @@ void OStatement_Base::anylizeSQL() } } //------------------------------------------------------------------ -void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, +void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, OSQLParseNode* pAscendingDescending) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::setOrderbyColumn" ); @@ -431,19 +431,19 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, else if (pColumnRef->count() == 3) { // Nur die Table Range-Variable darf hier vorkommen: -// if (!(pColumnRef->getChild(0)->getTokenValue() == aTableRange)) -// { -// aStatus.Set(SQL_STAT_ERROR, -// String::CreateFromAscii("S1000"), -// aStatus.CreateErrorMessage(String(SdbResId(STR_STAT_INVALID_RANGE_VAR))), -// 0, String() ); - // return; - // } +// if (!(pColumnRef->getChild(0)->getTokenValue() == aTableRange)) +// { +// aStatus.Set(SQL_STAT_ERROR, +// String::CreateFromAscii("S1000"), +// aStatus.CreateErrorMessage(String(SdbResId(STR_STAT_INVALID_RANGE_VAR))), +// 0, String() ); + // return; + // } pColumnRef->getChild(2)->parseNodeToStr( aColumnName, getOwnConnection(), NULL, sal_False, sal_False ); } else { - // aStatus.SetStatementTooComplex(); + // aStatus.SetStatementTooComplex(); throw SQLException(); } @@ -505,7 +505,7 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, default: break; } - + // at this moment we support only one table per select statement Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(xTabs.begin()->second,UNO_QUERY); if(xTunnel.is()) @@ -518,15 +518,15 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, } OSL_ENSURE(m_pTable,"No table!"); if ( m_pTable ) - m_xColNames = m_pTable->getColumns(); + m_xColNames = m_pTable->getColumns(); Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY); // set the binding of the resultrow - m_aRow = new OValueRefVector(xNames->getCount()); + m_aRow = new OValueRefVector(xNames->getCount()); (m_aRow->get())[0]->setBound(sal_True); ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetRefBound(sal_False)); // set the binding of the resultrow - m_aEvaluateRow = new OValueRefVector(xNames->getCount()); + m_aEvaluateRow = new OValueRefVector(xNames->getCount()); (m_aEvaluateRow->get())[0]->setBound(sal_True); ::std::for_each(m_aEvaluateRow->get().begin()+1,m_aEvaluateRow->get().end(),TSetRefBound(sal_False)); @@ -538,7 +538,7 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, // create the column mapping createColumnMapping(); - m_pSQLAnalyzer = createAnalyzer(); + m_pSQLAnalyzer = createAnalyzer(); Reference<XIndexesSupplier> xIndexSup(xTunnel,UNO_QUERY); if(xIndexSup.is()) @@ -554,7 +554,7 @@ void OStatement_Base::createColumnMapping() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::createColumnMapping" ); // initialize the column index map (mapping select columns to table columns) - ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_aSQLIterator.getSelectColumns(); + ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_aSQLIterator.getSelectColumns(); m_aColMapping.resize(xColumns->get().size() + 1); for (sal_Int32 i=0; i<(sal_Int32)m_aColMapping.size(); ++i) m_aColMapping[i] = i; @@ -579,7 +579,7 @@ void OStatement_Base::initializeResultSet(OResultSet* _pResult) _pResult->setSelectRow(m_aSelectRow); m_pSQLAnalyzer->bindSelectRow(m_aRow); - m_pEvaluationKeySet = m_pSQLAnalyzer->bindEvaluationRow(m_aEvaluateRow); // Werte im Code des Compilers setzen + m_pEvaluationKeySet = m_pSQLAnalyzer->bindEvaluationRow(m_aEvaluateRow); // Werte im Code des Compilers setzen _pResult->setEvaluationKeySet(m_pEvaluationKeySet); } // ----------------------------------------------------------------------------- @@ -720,7 +720,7 @@ void OStatement_Base::GetAssignValues() OSL_ENSURE(pComp->getNodeType() == SQL_NODE_EQUAL,"OResultSet: pComp->getNodeType() != SQL_NODE_COMPARISON"); if (pComp->getTokenValue().toChar() != '=') { - // aStatus.SetInvalidStatement(); + // aStatus.SetInvalidStatement(); throwFunctionSequenceException(*this); } @@ -757,7 +757,7 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam parseParamterElem(aColumnName,pRow_Value_Constructor_Elem); else { - // aStatus.SetStatementTooComplex(); + // aStatus.SetStatementTooComplex(); throwFunctionSequenceException(*this); } } @@ -776,15 +776,15 @@ void OStatement_Base::SetAssignValue(const String& aColumnName, if (!xCol.is()) { // Diese Column gibt es nicht! -// aStatus.Set(SQL_STAT_ERROR, -// String::CreateFromAscii("S0022"), -// aStatus.CreateErrorMessage(String(SdbResId(STR_STAT_COLUMN_NOT_FOUND))), -// 0, String() ); +// aStatus.Set(SQL_STAT_ERROR, +// String::CreateFromAscii("S0022"), +// aStatus.CreateErrorMessage(String(SdbResId(STR_STAT_COLUMN_NOT_FOUND))), +// 0, String() ); throwFunctionSequenceException(*this); } // Value an die Row mit den zuzuweisenden Werten binden: - // const ODbVariantRef& xValue = (*aAssignValues)[pFileColumn->GetId()]; + // const ODbVariantRef& xValue = (*aAssignValues)[pFileColumn->GetId()]; // Alles geprueft und wir haben den Namen der Column. // Jetzt eine Value allozieren, den Wert setzen und die Value an die Row binden. @@ -810,7 +810,7 @@ void OStatement_Base::SetAssignValue(const String& aColumnName, *(m_aAssignValues->get())[nId] = sal_False; else { - // aStatus.Set(SQL_STAT_ERROR); // nyi: genauer! + // aStatus.Set(SQL_STAT_ERROR); // nyi: genauer! throwFunctionSequenceException(*this); } } @@ -827,16 +827,16 @@ void OStatement_Base::SetAssignValue(const String& aColumnName, case DataType::TIMESTAMP: { *(m_aAssignValues->get())[nId] = ORowSetValue(aValue); // .ToDouble -// try -// { -// double n = xValue->toDouble(); -// xValue->setDouble(n); -// } -// catch ( ... ) -// { -// aStatus.SetDriverNotCapableError(); -// } - } break; +// try +// { +// double n = xValue->toDouble(); +// xValue->setDouble(n); +// } +// catch ( ... ) +// { +// aStatus.SetDriverNotCapableError(); +// } + } break; default: throwFunctionSequenceException(*this); } diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx index d5a9eea0407b..490d9c7bef5d 100644 --- a/connectivity/source/drivers/file/FStringFunctions.cxx +++ b/connectivity/source/drivers/file/FStringFunctions.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 @@ -205,7 +205,7 @@ ORowSetValue OOp_Replace::operate(const ::std::vector<ORowSetValue>& lhs) const { sStr = sStr.replaceAt(nIndexOf,sFrom.getLength(),sTo); nIndexOf = sStr.indexOf(sFrom,nIndexOf + sTo.getLength()); - } + } return sStr; } @@ -215,7 +215,7 @@ ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOp_Repeat::operate" ); if ( lhs.isNull() || rhs.isNull() ) return lhs; - + ::rtl::OUString sRet; sal_Int32 nCount = rhs; for (sal_Int32 i=0; i < nCount; ++i) @@ -244,7 +244,7 @@ ORowSetValue OOp_Left::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOp_Left::operate" ); if ( lhs.isNull() || rhs.isNull() ) return lhs; - + ::rtl::OUString sRet = lhs; sal_Int32 nCount = rhs; if ( nCount < 0 ) @@ -257,12 +257,12 @@ ORowSetValue OOp_Right::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOp_Right::operate" ); if ( lhs.isNull() || rhs.isNull() ) return lhs; - + sal_Int32 nCount = rhs; ::rtl::OUString sRet = lhs; if ( nCount < 0 || nCount >= sRet.getLength() ) return ORowSetValue(); - + return sRet.copy(sRet.getLength()-nCount,nCount); } diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 52974444a43c..edcf565aa9ae 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.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 @@ -63,11 +63,11 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection) DBG_CTOR( file_OFileTable, NULL ); construct(); TStringVector aVector; - // m_pColumns = new OColumns(this,m_aMutex,aVector); + // m_pColumns = new OColumns(this,m_aMutex,aVector); m_aColumns = new OSQLColumns(); } // ------------------------------------------------------------------------- -OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, +OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString& _Description , @@ -90,7 +90,7 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, DBG_CTOR( file_OFileTable, NULL ); m_aColumns = new OSQLColumns(); construct(); - // refreshColumns(); + // refreshColumns(); } // ------------------------------------------------------------------------- OFileTable::~OFileTable( ) @@ -115,7 +115,7 @@ void OFileTable::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new OColumns(this,m_aMutex,aVector); + m_pColumns = new OColumns(this,m_aMutex,aVector); } // ------------------------------------------------------------------------- void OFileTable::refreshKeys() diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx index b5d918f1f0d9..c56cf59a667e 100644 --- a/connectivity/source/drivers/file/FTables.cxx +++ b/connectivity/source/drivers/file/FTables.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 @@ -46,7 +46,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -namespace starutil = ::com::sun::star::util; +namespace starutil = ::com::sun::star::util; typedef connectivity::sdbcx::OCollection OCollection_TYPE; sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& /*_rName*/) diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index f55d609daf51..773b24b277ea 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.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 @@ -82,20 +82,20 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode) for (sal_uInt32 i = 0; i < pSelection->count(); i++) { OSQLParseNode *pColumnRef = pSelection->getChild(i)->getChild(0); - if ( ( SQL_ISRULE(pColumnRef,set_fct_spec) && pColumnRef->count() == 4 ) - || SQL_ISRULE(pColumnRef,char_value_fct) - || SQL_ISRULE(pColumnRef,char_substring_fct) - || SQL_ISRULE(pColumnRef,position_exp) - || SQL_ISRULE(pColumnRef,fold) - || SQL_ISRULE(pColumnRef,length_exp) - || SQL_ISRULE(pColumnRef,num_value_exp) - || SQL_ISRULE(pColumnRef,term) - || SQL_ISRULE(pColumnRef,factor) - || SQL_ISRULE(pColumnRef,set_fct_spec) ) + if ( ( SQL_ISRULE(pColumnRef,set_fct_spec) && pColumnRef->count() == 4 ) + || SQL_ISRULE(pColumnRef,char_value_fct) + || SQL_ISRULE(pColumnRef,char_substring_fct) + || SQL_ISRULE(pColumnRef,position_exp) + || SQL_ISRULE(pColumnRef,fold) + || SQL_ISRULE(pColumnRef,length_exp) + || SQL_ISRULE(pColumnRef,num_value_exp) + || SQL_ISRULE(pColumnRef,term) + || SQL_ISRULE(pColumnRef,factor) + || SQL_ISRULE(pColumnRef,set_fct_spec) ) { - ::rtl::Reference<OPredicateCompiler> pCompiler = new OPredicateCompiler(this); + ::rtl::Reference<OPredicateCompiler> pCompiler = new OPredicateCompiler(this); pCompiler->setOrigColumns(m_aCompiler->getOrigColumns()); - ::rtl::Reference<OPredicateInterpreter> pInterpreter = new OPredicateInterpreter(pCompiler); + ::rtl::Reference<OPredicateInterpreter> pInterpreter = new OPredicateInterpreter(pCompiler); pCompiler->execute( pColumnRef ); m_aSelectionEvaluations.push_back( TPredicates(pCompiler,pInterpreter) ); } @@ -119,7 +119,7 @@ void OSQLAnalyzer::bindRow(OCodeList& rCodeList,const OValueRefRow& _pRow,OEvalu // wenn nur ein Kriterium, und das entsprechende Feld ist indiziert // dann wird der Index verwendet - OEvaluateSet* pEvaluateSet = NULL; + OEvaluateSet* pEvaluateSet = NULL; for (OCodeList::iterator aIter = rCodeList.begin(); aIter != rCodeList.end(); ++aIter) { @@ -150,7 +150,7 @@ void OSQLAnalyzer::bindRow(OCodeList& rCodeList,const OValueRefRow& _pRow,OEvalu void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow) { // first the select part - OEvaluateSetList aEvaluateSetList; + OEvaluateSetList aEvaluateSetList; for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter) { if ( aIter->first.is() ) @@ -160,11 +160,11 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow) //------------------------------------------------------------------ ::std::vector<sal_Int32>* OSQLAnalyzer::bindEvaluationRow(OValueRefRow& _pRow) { - OEvaluateSetList aEvaluateSetList; + OEvaluateSetList aEvaluateSetList; bindRow( m_aCompiler->m_aCodeList,_pRow,aEvaluateSetList); - ::std::vector<sal_Int32>* pKeySet = NULL; - OEvaluateSet* pEvaluateSet = NULL; + ::std::vector<sal_Int32>* pKeySet = NULL; + OEvaluateSet* pEvaluateSet = NULL; // Keyset erzeugen mit kleinster Liste if(!aEvaluateSetList.empty()) @@ -174,7 +174,7 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow) pEvaluateSet = *(i); for(++i; i != aEvaluateSetList.end();++i) { - OEvaluateSet* pEvaluateSetComp = (*i); + OEvaluateSet* pEvaluateSetComp = (*i); for(OEvaluateSet::reverse_iterator j = pEvaluateSet->rbegin(); j != pEvaluateSet->rend(); ++j) { if (pEvaluateSetComp->find(j->second) != pEvaluateSetComp->end()) @@ -199,7 +199,7 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow) //------------------------------------------------------------------ void OSQLAnalyzer::describeParam(::rtl::Reference<OSQLColumns> rParameterColumns) { - OCodeList& rCodeList = m_aCompiler->m_aCodeList; + OCodeList& rCodeList = m_aCompiler->m_aCodeList; OCodeStack aCodeStack; if (!rCodeList.size()) @@ -216,7 +216,7 @@ void OSQLAnalyzer::describeParam(::rtl::Reference<OSQLColumns> rParameterColumns bindParameterRow(aParameterRow); OValueRefRow aTestRow = new OValueRefVector(Reference< XIndexAccess>(m_aCompiler->getOrigColumns(),UNO_QUERY)->getCount()); - delete bindEvaluationRow(aTestRow); // Binden der Attribute an die Values + delete bindEvaluationRow(aTestRow); // Binden der Attribute an die Values for(OCodeList::iterator aIter = rCodeList.begin(); aIter != rCodeList.end(); ++aIter) { @@ -227,11 +227,11 @@ void OSQLAnalyzer::describeParam(::rtl::Reference<OSQLColumns> rParameterColumns else { if (pOperator->getRequestedOperands() == 2) // bei zwei Operatoren ist es moeglich - { // einen Parameter weiter zu spezifizieren + { // einen Parameter weiter zu spezifizieren OOperandParam *pParam = PTR_CAST(OOperandParam,aCodeStack.top()); if (pParam) // Anpassen des ParameterTyps, wenn der linke Operand ein Attribut ist { - OOperandAttr *pLeft = PTR_CAST(OOperandAttr,*(rCodeList.end() - 2)); + OOperandAttr *pLeft = PTR_CAST(OOperandAttr,*(rCodeList.end() - 2)); if (pLeft) { Reference< XPropertySet> xCol; @@ -255,7 +255,7 @@ void OSQLAnalyzer::describeParam(::rtl::Reference<OSQLColumns> rParameterColumns OSL_ENSURE(0,"Illegal here!"); rParameterColumns = aNewParamColumns; - // m_aCompiler->setParameterColumns(rParameterColumns); + // m_aCompiler->setParameterColumns(rParameterColumns); } // ----------------------------------------------------------------------------- @@ -292,7 +292,7 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std: { if ( aIter->second.is() ) { - sal_Int32 map = nPos; + sal_Int32 map = nPos; // the first column (index 0) is for convenience only. The first real select column is no 1. if ( (nPos > 0) && (nPos < static_cast<sal_Int32>(_rColumnMapping.size())) ) map = _rColumnMapping[nPos]; diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 67c58ad9ca7a..bb48041a3036 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.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 @@ -135,7 +135,7 @@ sal_Bool OOperandAttr::isIndexed() const } //------------------------------------------------------------------ OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos) - : OOperandRow(static_cast<sal_uInt16>(_nPos), DataType::VARCHAR) // Standard-Typ + : OOperandRow(static_cast<sal_uInt16>(_nPos), DataType::VARCHAR) // Standard-Typ { OSL_ENSURE(SQL_ISRULE(pNode,parameter),"Argument ist kein Parameter"); OSL_ENSURE(pNode->count() > 0,"Fehler im Parse Tree"); @@ -158,8 +158,8 @@ OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos) // Symmetriegruenden ...) // todo - // OColumn* pColumn = new OFILEColumn(aParameterName,eDBType,255,0,SQL_FLAGS_NULLALLOWED); - // rParamColumns->AddColumn(pColumn); + // OColumn* pColumn = new OFILEColumn(aParameterName,eDBType,255,0,SQL_FLAGS_NULLALLOWED); + // rParamColumns->AddColumn(pColumn); // der Wert wird erst kurz vor der Auswertung gesetzt } @@ -179,15 +179,15 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const rtl::OUStrin switch (rColumnRef.getNodeType()) { case SQL_NODE_STRING: - m_aValue = aStrValue; - m_eDBType = DataType::VARCHAR; + m_aValue = aStrValue; + m_eDBType = DataType::VARCHAR; m_aValue.setBound(sal_True); return; case SQL_NODE_INTNUM: case SQL_NODE_APPROXNUM: { - m_aValue = aStrValue.toDouble(); - m_eDBType = DataType::DOUBLE; + m_aValue = aStrValue.toDouble(); + m_eDBType = DataType::DOUBLE; m_aValue.setBound(sal_True); return; } @@ -230,9 +230,9 @@ sal_Bool OBoolOperator::operate(const OOperand*, const OOperand*) const void OBoolOperator::Exec(OCodeStack& rCodeStack) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OBoolOperator::Exec" ); - OOperand *pRight = rCodeStack.top(); + OOperand *pRight = rCodeStack.top(); rCodeStack.pop(); - OOperand *pLeft = rCodeStack.top(); + OOperand *pLeft = rCodeStack.top(); rCodeStack.pop(); rCodeStack.push(new OOperandResultBOOL(operate(pLeft, pRight))); @@ -259,7 +259,7 @@ void OOp_NOT::Exec(OCodeStack& rCodeStack) delete pOperand; } //------------------------------------------------------------------ -sal_uInt16 OOp_NOT::getRequestedOperands() const +sal_uInt16 OOp_NOT::getRequestedOperands() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOp_NOT::getRequestedOperands" ); return 1; @@ -280,7 +280,7 @@ sal_Bool OOp_OR::operate(const OOperand* pLeft, const OOperand* pRight) const } //------------------------------------------------------------------ -sal_uInt16 OOp_ISNULL::getRequestedOperands() const +sal_uInt16 OOp_ISNULL::getRequestedOperands() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOp_ISNULL::getRequestedOperands" ); return 1; @@ -364,13 +364,13 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con sRH.pData->length ); switch(aPredicateType) { - case SQLFilterOperator::EQUAL: bResult = (nRes == 0); break; - case SQLFilterOperator::NOT_EQUAL: bResult = (nRes != 0); break; - case SQLFilterOperator::LESS: bResult = (nRes < 0); break; - case SQLFilterOperator::LESS_EQUAL: bResult = (nRes <= 0); break; - case SQLFilterOperator::GREATER: bResult = (nRes > 0); break; - case SQLFilterOperator::GREATER_EQUAL: bResult = (nRes >= 0); break; - default: bResult = sal_False; + case SQLFilterOperator::EQUAL: bResult = (nRes == 0); break; + case SQLFilterOperator::NOT_EQUAL: bResult = (nRes != 0); break; + case SQLFilterOperator::LESS: bResult = (nRes < 0); break; + case SQLFilterOperator::LESS_EQUAL: bResult = (nRes <= 0); break; + case SQLFilterOperator::GREATER: bResult = (nRes > 0); break; + case SQLFilterOperator::GREATER_EQUAL: bResult = (nRes >= 0); break; + default: bResult = sal_False; } } break; case DataType::TINYINT: @@ -389,15 +389,15 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con switch (aPredicateType) { - case SQLFilterOperator::EQUAL: bResult = (n == m); break; - case SQLFilterOperator::LIKE: bResult = (n == m); break; - case SQLFilterOperator::NOT_EQUAL: bResult = (n != m); break; - case SQLFilterOperator::NOT_LIKE: bResult = (n != m); break; - case SQLFilterOperator::LESS: bResult = (n < m); break; - case SQLFilterOperator::LESS_EQUAL: bResult = (n <= m); break; - case SQLFilterOperator::GREATER: bResult = (n > m); break; - case SQLFilterOperator::GREATER_EQUAL: bResult = (n >= m); break; - default: bResult = sal_False; + case SQLFilterOperator::EQUAL: bResult = (n == m); break; + case SQLFilterOperator::LIKE: bResult = (n == m); break; + case SQLFilterOperator::NOT_EQUAL: bResult = (n != m); break; + case SQLFilterOperator::NOT_LIKE: bResult = (n != m); break; + case SQLFilterOperator::LESS: bResult = (n < m); break; + case SQLFilterOperator::LESS_EQUAL: bResult = (n <= m); break; + case SQLFilterOperator::GREATER: bResult = (n > m); break; + case SQLFilterOperator::GREATER_EQUAL: bResult = (n >= m); break; + default: bResult = sal_False; } } break; default: @@ -411,9 +411,9 @@ void ONumOperator::Exec(OCodeStack& rCodeStack) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ONumOperator::Exec" ); - OOperand *pRight = rCodeStack.top(); + OOperand *pRight = rCodeStack.top(); rCodeStack.pop(); - OOperand *pLeft = rCodeStack.top(); + OOperand *pLeft = rCodeStack.top(); rCodeStack.pop(); rCodeStack.push(new OOperandResultNUM(operate(pLeft->getValue(), pRight->getValue()))); @@ -465,7 +465,7 @@ void ONthOperator::Exec(OCodeStack& rCodeStack) do { OSL_ENSURE(!rCodeStack.empty(),"Stack must be none empty!"); - pOperand = rCodeStack.top(); + pOperand = rCodeStack.top(); rCodeStack.pop(); if ( !IS_TYPE(OStopOperand,pOperand) ) aValues.push_back( pOperand->getValue() ); @@ -487,9 +487,9 @@ void ONthOperator::Exec(OCodeStack& rCodeStack) void OBinaryOperator::Exec(OCodeStack& rCodeStack) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OBinaryOperator::Exec" ); - OOperand *pRight = rCodeStack.top(); + OOperand *pRight = rCodeStack.top(); rCodeStack.pop(); - OOperand *pLeft = rCodeStack.top(); + OOperand *pLeft = rCodeStack.top(); rCodeStack.pop(); if ( !rCodeStack.empty() && IS_TYPE(OStopOperand,rCodeStack.top()) ) diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index fc0d3d4741ee..9e05f9a91fd1 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.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 @@ -58,7 +58,7 @@ using namespace ::com::sun::star::util; DBG_NAME(OPredicateCompiler) //------------------------------------------------------------------ OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs) - // : m_rCursor(rCurs) + // : m_rCursor(rCurs) : m_pAnalyzer(pAnalyzer) , m_nParamCounter(0) , m_bORCondition(FALSE) @@ -76,11 +76,11 @@ OPredicateCompiler::~OPredicateCompiler() void OPredicateCompiler::dispose() { Clean(); - m_orgColumns = NULL; + m_orgColumns = NULL; m_xIndexes.clear(); } //------------------------------------------------------------------ -// inline OCursor& OPredicateCompiler::Cursor() const {return m_rCursor;} +// inline OCursor& OPredicateCompiler::Cursor() const {return m_rCursor;} //------------------------------------------------------------------ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode) { @@ -117,8 +117,8 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode) } - pWhereClause = pTableExp->getChild(1); - pOrderbyClause = pTableExp->getChild(4); + pWhereClause = pTableExp->getChild(1); + pOrderbyClause = pTableExp->getChild(4); } else if (SQL_ISRULE(pSQLParseNode,update_statement_searched)) { @@ -156,25 +156,25 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode) OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode) { OOperand* pOperand = NULL; - if (pPredicateNode->count() == 3 && // Ausdruck is geklammert + if (pPredicateNode->count() == 3 && // Ausdruck is geklammert SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"(") && SQL_ISPUNCTUATION(pPredicateNode->getChild(2),")")) { execute(pPredicateNode->getChild(1)); } else if ((SQL_ISRULE(pPredicateNode,search_condition) || (SQL_ISRULE(pPredicateNode,boolean_term))) - && // AND/OR-Verknuepfung: + && // AND/OR-Verknuepfung: pPredicateNode->count() == 3) { - execute(pPredicateNode->getChild(0)); // Bearbeiten des linken Zweigs - execute(pPredicateNode->getChild(2)); // Bearbeiten des rechten Zweigs + execute(pPredicateNode->getChild(0)); // Bearbeiten des linken Zweigs + execute(pPredicateNode->getChild(2)); // Bearbeiten des rechten Zweigs - if (SQL_ISTOKEN(pPredicateNode->getChild(1),OR)) // OR-Operator + if (SQL_ISTOKEN(pPredicateNode->getChild(1),OR)) // OR-Operator { m_aCodeList.push_back(new OOp_OR()); m_bORCondition = sal_True; } - else if (SQL_ISTOKEN(pPredicateNode->getChild(1),AND)) // AND-Operator + else if (SQL_ISTOKEN(pPredicateNode->getChild(1),AND)) // AND-Operator m_aCodeList.push_back(new OOp_AND()); else { @@ -204,8 +204,8 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode) } else if(SQL_ISRULE(pPredicateNode,num_value_exp)) { - execute(pPredicateNode->getChild(0)); // Bearbeiten des linken Zweigs - execute(pPredicateNode->getChild(2)); // Bearbeiten des rechten Zweigs + execute(pPredicateNode->getChild(0)); // Bearbeiten des linken Zweigs + execute(pPredicateNode->getChild(2)); // Bearbeiten des rechten Zweigs if (SQL_ISPUNCTUATION(pPredicateNode->getChild(1),"+")) { m_aCodeList.push_back(new OOp_ADD()); @@ -219,8 +219,8 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode) } else if(SQL_ISRULE(pPredicateNode,term)) { - execute(pPredicateNode->getChild(0)); // Bearbeiten des linken Zweigs - execute(pPredicateNode->getChild(2)); // Bearbeiten des rechten Zweigs + execute(pPredicateNode->getChild(0)); // Bearbeiten des linken Zweigs + execute(pPredicateNode->getChild(2)); // Bearbeiten des rechten Zweigs if (SQL_ISPUNCTUATION(pPredicateNode->getChild(1),"*")) { m_aCodeList.push_back(new OOp_MUL()); @@ -233,7 +233,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode) } } else - pOperand = execute_Operand(pPredicateNode); // jetzt werden nur einfache Operanden verarbeitet + pOperand = execute_Operand(pPredicateNode); // jetzt werden nur einfache Operanden verarbeitet return pOperand; } @@ -243,17 +243,17 @@ OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) th { DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Fehler im Parse Tree"); - if ( !(SQL_ISRULE(pPredicateNode->getChild(0),column_ref) || - pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_STRING || - pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_INTNUM || - pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_APPROXNUM || - SQL_ISTOKEN(pPredicateNode->getChild(2),TRUE) || - SQL_ISTOKEN(pPredicateNode->getChild(2),FALSE) || - SQL_ISRULE(pPredicateNode->getChild(2),parameter) || + if ( !(SQL_ISRULE(pPredicateNode->getChild(0),column_ref) || + pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_STRING || + pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_INTNUM || + pPredicateNode->getChild(2)->getNodeType() == SQL_NODE_APPROXNUM || + SQL_ISTOKEN(pPredicateNode->getChild(2),TRUE) || + SQL_ISTOKEN(pPredicateNode->getChild(2),FALSE) || + SQL_ISRULE(pPredicateNode->getChild(2),parameter) || // odbc date - SQL_ISRULE(pPredicateNode->getChild(2),set_fct_spec) || - SQL_ISRULE(pPredicateNode->getChild(2),position_exp) || - SQL_ISRULE(pPredicateNode->getChild(2),char_substring_fct) || + SQL_ISRULE(pPredicateNode->getChild(2),set_fct_spec) || + SQL_ISRULE(pPredicateNode->getChild(2),position_exp) || + SQL_ISRULE(pPredicateNode->getChild(2),char_substring_fct) || // upper, lower etc. SQL_ISRULE(pPredicateNode->getChild(2),fold)) ) { @@ -295,8 +295,8 @@ OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw( sal_Unicode cEscape = L'\0'; const bool bNotLike = pPart2->getChild(0)->isToken(); - OSQLParseNode* pAtom = pPart2->getChild(pPart2->count()-2); - OSQLParseNode* pOptEscape = pPart2->getChild(pPart2->count()-1); + OSQLParseNode* pAtom = pPart2->getChild(pPart2->count()-2); + OSQLParseNode* pOptEscape = pPart2->getChild(pPart2->count()-1); if (!(pAtom->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(pAtom,parameter))) { @@ -339,7 +339,7 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr if ( !(p1stValue->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(p1stValue,parameter)) - && !(p2ndtValue->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(p2ndtValue,parameter)) + && !(p2ndtValue->getNodeType() == SQL_NODE_STRING || SQL_ISRULE(p2ndtValue,parameter)) ) { m_pAnalyzer->getConnection()->throwGenericSQLException(STR_QUERY_INVALID_BETWEEN,NULL); @@ -408,7 +408,7 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr return NULL; } //------------------------------------------------------------------ -OOperand* OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +OOperand* OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) { DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree"); const OSQLParseNode* pPart2 = pPredicateNode->getChild(1); @@ -434,7 +434,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr if (SQL_ISRULE(pPredicateNode,column_ref)) { - ::rtl::OUString aColumnName; + ::rtl::OUString aColumnName; if (pPredicateNode->count() == 1) { aColumnName = pPredicateNode->getChild(0)->getTokenValue(); @@ -533,9 +533,9 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr { execute_Fold(pPredicateNode); } - else if( SQL_ISRULE(pPredicateNode,set_fct_spec) - || SQL_ISRULE(pPredicateNode,position_exp) - || SQL_ISRULE(pPredicateNode,char_substring_fct) + else if( SQL_ISRULE(pPredicateNode,set_fct_spec) + || SQL_ISRULE(pPredicateNode,position_exp) + || SQL_ISRULE(pPredicateNode,char_substring_fct) ) { executeFunction(pPredicateNode); @@ -609,7 +609,7 @@ void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueD delete pOperand; } // ----------------------------------------------------------------------------- -OOperand* OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +OOperand* OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) { DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree"); @@ -626,7 +626,7 @@ OOperand* OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) thro return NULL; } // ----------------------------------------------------------------------------- -OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) { OOperator* pOperator = NULL; diff --git a/connectivity/source/drivers/file/file.xml b/connectivity/source/drivers/file/file.xml index 2d8281bca957..b3b681c30576 100644 --- a/connectivity/source/drivers/file/file.xml +++ b/connectivity/source/drivers/file/file.xml @@ -12,7 +12,7 @@ <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> <supported-service>com.sun.star.sdbcx.Driver</supported-service> - <service-dependency> ... </service-dependency> + <service-dependency> ... </service-dependency> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx index eea854031905..5847b94e8817 100644 --- a/connectivity/source/drivers/file/quotedstring.cxx +++ b/connectivity/source/drivers/file/quotedstring.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 @@ -45,8 +45,8 @@ namespace connectivity return 0; xub_StrLen nTokCount = 1; - BOOL bStart = TRUE; // Stehen wir auf dem ersten Zeichen im Token? - BOOL bInString = FALSE; // Befinden wir uns INNERHALB eines (cStrDel delimited) String? + BOOL bStart = TRUE; // Stehen wir auf dem ersten Zeichen im Token? + BOOL bInString = FALSE; // Befinden wir uns INNERHALB eines (cStrDel delimited) String? // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen for( xub_StrLen i = 0; i < nLen; ++i ) @@ -58,12 +58,12 @@ namespace connectivity // Erstes Zeichen ein String-Delimiter? if ( cChar == cStrDel ) { - bInString = TRUE; // dann sind wir jetzt INNERHALB des Strings! - continue; // dieses Zeichen ueberlesen! + bInString = TRUE; // dann sind wir jetzt INNERHALB des Strings! + continue; // dieses Zeichen ueberlesen! } } - if (bInString) + if (bInString) { // Wenn jetzt das String-Delimiter-Zeichen auftritt ... if ( cChar == cStrDel ) @@ -71,7 +71,7 @@ namespace connectivity if ((i+1 < nLen) && (m_sString.GetChar(i+1) == cStrDel)) { // Verdoppeltes String-Delimiter-Zeichen: - ++i; // kein String-Ende, naechstes Zeichen ueberlesen. + ++i; // kein String-Ende, naechstes Zeichen ueberlesen. } else { @@ -79,8 +79,8 @@ namespace connectivity bInString = FALSE; } } - } // if (bInString) - else + } // if (bInString) + else { // Stimmt das Tokenzeichen ueberein, dann erhoehe TokCount if ( cChar == cTok ) @@ -103,11 +103,11 @@ namespace connectivity const xub_StrLen nLen = m_sString.Len(); if ( nLen ) { - BOOL bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String? + BOOL bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String? // Erstes Zeichen ein String-Delimiter? if (bInString ) - ++nStartPos; // dieses Zeichen ueberlesen! + ++nStartPos; // dieses Zeichen ueberlesen! if ( nStartPos >= nLen ) return; @@ -127,7 +127,7 @@ namespace connectivity // Verdoppeltes String-Delimiter-Zeichen: // kein String-Ende, naechstes Zeichen ueberlesen. ++i; - *pData++ = m_sString.GetChar(i); // Zeichen gehoert zum Resultat-String + *pData++ = m_sString.GetChar(i); // Zeichen gehoert zum Resultat-String } else { @@ -138,7 +138,7 @@ namespace connectivity } else { - *pData++ = cChar; // Zeichen gehoert zum Resultat-String + *pData++ = cChar; // Zeichen gehoert zum Resultat-String } } @@ -154,7 +154,7 @@ namespace connectivity } else { - *pData++ = cChar; // Zeichen gehoert zum Resultat-String + *pData++ = cChar; // Zeichen gehoert zum Resultat-String } } } // for( xub_StrLen i = nStartPos; i < nLen; ++i ) diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx index 5bdff8c75bff..f1327e152bda 100644 --- a/connectivity/source/drivers/flat/ECatalog.cxx +++ b/connectivity/source/drivers/flat/ECatalog.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/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx index 43d78e0479bf..7fdbeca25c4b 100644 --- a/connectivity/source/drivers/flat/EColumns.cxx +++ b/connectivity/source/drivers/flat/EColumns.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/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx index 1808e760c430..0097e075efd7 100644 --- a/connectivity/source/drivers/flat/EConnection.cxx +++ b/connectivity/source/drivers/flat/EConnection.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 @@ -52,7 +52,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; // -------------------------------------------------------------------------------- -OFlatConnection::OFlatConnection(ODriver* _pDriver) : OConnection(_pDriver) +OFlatConnection::OFlatConnection(ODriver* _pDriver) : OConnection(_pDriver) ,m_bHeaderLine(sal_True) ,m_cFieldDelimiter(';') ,m_cStringDelimiter('"') diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx index 29991697fb7b..62568e68efd0 100644 --- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx +++ b/connectivity/source/drivers/flat/EDatabaseMetaData.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 @@ -49,7 +49,7 @@ using namespace ::comphelper; using namespace connectivity; using namespace connectivity::flat; -// using namespace connectivity::file; +// using namespace connectivity::file; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbcx; @@ -58,7 +58,7 @@ using namespace ::com::sun::star::container; -OFlatDatabaseMetaData::OFlatDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon) +OFlatDatabaseMetaData::OFlatDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatDatabaseMetaData::OFlatDatabaseMetaData" ); } @@ -75,7 +75,7 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw( ) ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo); Reference< XResultSet > xRef = pResult; - + static ODatabaseMetaDataResultSet::ORows aRows; if(aRows.empty()) { @@ -186,8 +186,8 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( ODatabaseMetaDataResultSet::ORow aRow(19); aRow[10] = new ORowSetValueDecorator((sal_Int32)10); Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames()); - const ::rtl::OUString* pTabBegin = aTabNames.getConstArray(); - const ::rtl::OUString* pTabEnd = pTabBegin + aTabNames.getLength(); + const ::rtl::OUString* pTabBegin = aTabNames.getConstArray(); + const ::rtl::OUString* pTabEnd = pTabBegin + aTabNames.getLength(); for(;pTabBegin != pTabEnd;++pTabBegin) { if(match(tableNamePattern,*pTabBegin,'\0')) diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index b4ea6e4d5fc8..13d79d8756dc 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.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/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx index 4800d96a2907..601aadbb7b3a 100644 --- a/connectivity/source/drivers/flat/EPreparedStatement.cxx +++ b/connectivity/source/drivers/flat/EPreparedStatement.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/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 5c4892becdad..0d15b881db8b 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.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 @@ -45,10 +45,10 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// using namespace com::sun::star::container; -// using namespace com::sun::star::util; +// using namespace com::sun::star::container; +// using namespace com::sun::star::util; //------------------------------------------------------------------------------ -OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) +OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) : file::OResultSet(pStmt,_aSQLIterator) ,m_bBookmarkable(sal_True) { @@ -93,7 +93,7 @@ Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) throw( RuntimeException) { Sequence< Type > aTypes = OResultSet::getTypes(); ::std::vector<Type> aOwnTypes; - aOwnTypes.reserve(aTypes.getLength()); + aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) @@ -124,7 +124,7 @@ sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) throw( { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False; @@ -135,7 +135,7 @@ sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - + m_bRowDeleted = m_bRowInserted = m_bRowUpdated = sal_False; diff --git a/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx index f7b617e8019e..6dd16a00b6ce 100644 --- a/connectivity/source/drivers/flat/EStatement.cxx +++ b/connectivity/source/drivers/flat/EStatement.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/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 622da47534f2..02cc780a47c5 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.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 @@ -42,7 +42,7 @@ #include <comphelper/sequence.hxx> #include <svl/zforlist.hxx> #include <rtl/math.hxx> -#include <stdio.h> //sprintf +#include <stdio.h> //sprintf #include <comphelper/extract.hxx> #include <comphelper/numbers.hxx> #include "flat/EDriver.hxx" @@ -288,7 +288,7 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) break; default: eType = DataType::VARCHAR; - nPrecision = 0; // nyi: Daten koennen aber laenger sein! + nPrecision = 0; // nyi: Daten koennen aber laenger sein! nScale = 0; { static const ::rtl::OUString s_sVARCHAR(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")); @@ -383,8 +383,8 @@ void OFlatTable::construct() // Buffersize abhaengig von der Filegroesse m_pFileStream->SetBufferSize(nSize > 1000000 ? 32768 : - nSize > 100000 ? 16384 : - nSize > 10000 ? 4096 : 1024); + nSize > 100000 ? 16384 : + nSize > 10000 ? 4096 : 1024); fillColumns(aAppLocale); @@ -451,7 +451,7 @@ void OFlatTable::refreshColumns() if(m_pColumns) m_pColumns->reFill(aVector); else - m_pColumns = new OFlatColumns(this,m_aMutex,aVector); + m_pColumns = new OFlatColumns(this,m_aMutex,aVector); } // ------------------------------------------------------------------------- @@ -472,10 +472,10 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException) const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) { - if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) || - *pBegin == ::getCppuType((const Reference<XRename>*)0) || + if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) || + *pBegin == ::getCppuType((const Reference<XRename>*)0) || *pBegin == ::getCppuType((const Reference<XIndexesSupplier>*)0) || - *pBegin == ::getCppuType((const Reference<XAlterTable>*)0) || + *pBegin == ::getCppuType((const Reference<XAlterTable>*)0) || *pBegin == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))) { aOwnTypes.push_back(*pBegin); @@ -488,10 +488,10 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException) // ------------------------------------------------------------------------- Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeException) { - if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) || - rType == ::getCppuType((const Reference<XIndexesSupplier>*)0) || - rType == ::getCppuType((const Reference<XRename>*)0) || - rType == ::getCppuType((const Reference<XAlterTable>*)0) || + if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) || + rType == ::getCppuType((const Reference<XIndexesSupplier>*)0) || + rType == ::getCppuType((const Reference<XRename>*)0) || + rType == ::getCppuType((const Reference<XAlterTable>*)0) || rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0)) return Any(); @@ -533,7 +533,7 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal if (!bRetrieveData) return TRUE; if ( m_bNeedToReadLine ) - { + { sal_Int32 nCurrentPos = 0; m_pFileStream->Seek(m_nFilePos); readLine(nCurrentPos); @@ -559,18 +559,18 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal else { // Laengen je nach Datentyp: - sal_Int32 nLen, + sal_Int32 nLen, nType = 0; if(bIsTable) { - nLen = m_aPrecisions[i-1]; - nType = m_aTypes[i-1]; + nLen = m_aPrecisions[i-1]; + nType = m_aTypes[i-1]; } else { Reference< XPropertySet> xColumn = *aIter; - xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen; - xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; + xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen; + xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; } switch(nType) { @@ -598,13 +598,13 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal { (_rRow->get())[i]->setNull(); } - } break; + } break; case DataType::DOUBLE: case DataType::INTEGER: - case DataType::DECIMAL: // #99178# OJ + case DataType::DECIMAL: // #99178# OJ case DataType::NUMERIC: { - + String aStrConverted; if ( DataType::INTEGER != nType ) { @@ -618,7 +618,7 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal // In Standard-Notation (DezimalPUNKT ohne Tausender-Komma) umwandeln: for (xub_StrLen j = 0; j < aStr.Len(); ++j) { - const sal_Unicode cChar = aStr.GetChar(j); + const sal_Unicode cChar = aStr.GetChar(j); if (cDecimalDelimiter && cChar == cDecimalDelimiter) *pData++ = '.'; //aStrConverted.Append( '.' ); @@ -681,7 +681,7 @@ sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int // run through case IResultSetHelper::NEXT: { - ++m_nRowPos; + ++m_nRowPos; ::std::map<sal_Int32,TRowPositionsInFile::iterator>::const_iterator aFind = m_aRowPosToFilePos.find(m_nRowPos); m_bNeedToReadLine = aFind != m_aRowPosToFilePos.end(); if ( m_bNeedToReadLine ) @@ -698,13 +698,13 @@ sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int { m_nMaxRowCount = m_nRowPos -1; return sal_False; - } // if ( m_pFileStream->IsEof() || !readLine(nCurPos) /*|| !checkHeaderLine()*/) + } // if ( m_pFileStream->IsEof() || !readLine(nCurPos) /*|| !checkHeaderLine()*/) TRowPositionsInFile::iterator aPos = m_aFilePosToEndLinePos.insert(TRowPositionsInFile::value_type(m_nFilePos,nCurPos)).first; m_aRowPosToFilePos.insert(::std::map<sal_Int32,TRowPositionsInFile::iterator>::value_type(m_nRowPos,aPos)); } } - + break; case IResultSetHelper::PRIOR: --m_nRowPos; @@ -726,11 +726,11 @@ sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int m_nRowPos = aLastPos->first; m_nFilePos = aLastPos->second->first; nCurPos = aLastPos->second->second; - + //m_pFileStream->Seek(m_nFilePos); m_bNeedToReadLine = true; //if ( m_pFileStream->IsEof() /*|| !checkHeaderLine()*/ || !readLine(nCurPos) ) - // return sal_False; + // return sal_False; } else { @@ -763,7 +763,7 @@ sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int //m_pFileStream->Seek(m_nFilePos); m_bNeedToReadLine = true; //if ( m_pFileStream->IsEof() /*|| !checkHeaderLine()*/ || !readLine(nCurPos) ) - // return sal_False; + // return sal_False; } else if(m_nMaxRowCount && nOffset > m_nMaxRowCount) // offset is outside the table { @@ -776,7 +776,7 @@ sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int if(aIter == m_aRowPosToFilePos.end()) { ::std::map<sal_Int32,TRowPositionsInFile::iterator>::reverse_iterator aLastPos = m_aRowPosToFilePos.rbegin(); - m_nRowPos = aLastPos->first; + m_nRowPos = aLastPos->first; nCurPos = m_nFilePos = aLastPos->second->first; while(m_nRowPos != nOffset) seekRow(IResultSetHelper::NEXT,1,nCurPos); @@ -784,13 +784,13 @@ sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int else { --aIter; - m_nRowPos = aIter->first; - m_nFilePos = aIter->second->first; - nCurPos = aIter->second->second; + m_nRowPos = aIter->first; + m_nFilePos = aIter->second->first; + nCurPos = aIter->second->second; //m_pFileStream->Seek(m_nFilePos); m_bNeedToReadLine = true; //if ( m_pFileStream->IsEof() /*|| !checkHeaderLine()*/ || !readLine(nCurPos) ) - // return sal_False; + // return sal_False; } } } @@ -805,7 +805,7 @@ sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int m_nFilePos = aFind->first; nCurPos = aFind->second; } - else + else { m_nFilePos = nOffset; m_pFileStream->Seek(nOffset); diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx index a0bb6a170838..e3b1be37cf55 100644 --- a/connectivity/source/drivers/flat/ETables.cxx +++ b/connectivity/source/drivers/flat/ETables.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 @@ -49,7 +49,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -namespace starutil = ::com::sun::star::util; +namespace starutil = ::com::sun::star::util; sdbcx::ObjectType OFlatTables::createObject(const ::rtl::OUString& _rName) { diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index 952365e43ab1..bb142b83fe1c 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.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 @@ -116,8 +116,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/flat/flat.xcu b/connectivity/source/drivers/flat/flat.xcu index d00d1f98c38c..ed29028ea966 100755 --- a/connectivity/source/drivers/flat/flat.xcu +++ b/connectivity/source/drivers/flat/flat.xcu @@ -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/source/drivers/flat/flat.xml b/connectivity/source/drivers/flat/flat.xml index f3738cc312ba..77b45c48daed 100644 --- a/connectivity/source/drivers/flat/flat.xml +++ b/connectivity/source/drivers/flat/flat.xml @@ -12,7 +12,7 @@ <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> <supported-service>com.sun.star.sdbcx.Driver</supported-service> - <service-dependency> ... </service-dependency> + <service-dependency> ... </service-dependency> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index a1cb584b8bf6..2412ed906ca3 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.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 @@ -71,7 +71,7 @@ void OHCatalog::refreshTables() Sequence< ::rtl::OUString > sTableTypes(2); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; - + refreshObjects(sTableTypes,aVector); if ( m_pTables ) @@ -149,7 +149,7 @@ Sequence< Type > SAL_CALL OHCatalog::getTypes( ) throw(RuntimeException) { Sequence< Type > aTypes = OCatalog::getTypes(); ::std::vector<Type> aOwnTypes; - aOwnTypes.reserve(aTypes.getLength()); + aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx index c1a640ec4036..c8d83e0d2b4e 100644 --- a/connectivity/source/drivers/hsqldb/HColumns.cxx +++ b/connectivity/source/drivers/hsqldb/HColumns.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 @@ -43,7 +43,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OHSQLColumns::OHSQLColumns( ::cppu::OWeakObject& _rParent +OHSQLColumns::OHSQLColumns( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -58,8 +58,8 @@ Reference< XPropertySet > OHSQLColumns::createDescriptor() } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -OHSQLColumn::OHSQLColumn( sal_Bool _bCase) - : connectivity::sdbcx::OColumn( _bCase ) +OHSQLColumn::OHSQLColumn( sal_Bool _bCase) + : connectivity::sdbcx::OColumn( _bCase ) { construct(); } @@ -67,7 +67,7 @@ OHSQLColumn::OHSQLColumn( sal_Bool _bCase) void OHSQLColumn::construct() { m_sAutoIncrement = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IDENTITY")); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OHSQLColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 07fc4ec5e00a..543e6b39328d 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.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 @@ -170,7 +170,7 @@ namespace connectivity { namespace hsqldb void SAL_CALL OHsqlConnection::flush( ) throw (RuntimeException) { MethodGuard aGuard( *this ); - + try { if ( m_xConnection.is() ) diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 583c33112caa..c551312d0cdc 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.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 @@ -260,7 +260,7 @@ namespace connectivity makeAny( lcl_getPermittedJavaMethods_nothrow( m_xFactory ) ) ); aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) ); - + const ::rtl::OUString sProperties( RTL_CONSTASCII_USTRINGPARAM( "properties" ) ); ::rtl::OUString sMessage; try @@ -282,7 +282,7 @@ namespace connectivity const sal_Int32 nMajor = sLine.GetToken(0,'.').ToInt32(); const sal_Int32 nMinor = sLine.GetToken(1,'.').ToInt32(); const sal_Int32 nMicro = sLine.GetToken(2,'.').ToInt32(); - if ( nMajor > 1 + if ( nMajor > 1 || ( nMajor == 1 && nMinor > 8 ) || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) ) { @@ -469,7 +469,7 @@ namespace connectivity const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } - + return getDataDefinitionByConnection(connect(url,info)); } @@ -882,7 +882,7 @@ namespace connectivity //------------------------------------------------------------------ //------------------------------------------------------------------ //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HStorage.hxx b/connectivity/source/drivers/hsqldb/HStorage.hxx index cd7e94b44bf0..f13dc3be283b 100644 --- a/connectivity/source/drivers/hsqldb/HStorage.hxx +++ b/connectivity/source/drivers/hsqldb/HStorage.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,43 +42,43 @@ #include <comphelper/broadcasthelper.hxx> -#define DECLARE_SERVICE_INFO_STATIC() \ - DECLARE_SERVICE_INFO(); \ - static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ +#define DECLARE_SERVICE_INFO_STATIC() \ + DECLARE_SERVICE_INFO(); \ + static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ + SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ namespace connectivity { namespace hsqldb { - typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::io::XStream - , ::com::sun::star::io::XInputStream - , ::com::sun::star::io::XOutputStream - , ::com::sun::star::io::XSeekable - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XServiceInfo> OStorage_Base; + typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::io::XStream + , ::com::sun::star::io::XInputStream + , ::com::sun::star::io::XOutputStream + , ::com::sun::star::io::XSeekable + , ::com::sun::star::lang::XInitialization + , ::com::sun::star::lang::XServiceInfo> OStorage_Base; class OStorage : public ::comphelper::OBaseMutex ,public OStorage_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentSubStorageSupplier> m_xDS; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentSubStorageSupplier> m_xDS; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> m_xStorge; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xIn; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOut; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeek; + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> m_xStorge; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xIn; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOut; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeek; - OStorage(); // never implemented - OStorage(const OStorage&); // never implemented - int operator= (const OStorage&); // never implemented + OStorage(); // never implemented + OStorage(const OStorage&); // never implemented + int operator= (const OStorage&); // never implemented OStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); protected: /** this function is called upon disposing the component */ diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 1ce47beb572f..b4a898275b94 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.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 @@ -237,7 +237,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js jsize nLen = env->GetArrayLength(buffer); if ( nLen < len || len <= 0 ) { - ThrowException( env, + ThrowException( env, "java/io/IOException", "len is greater or equal to the buffer size"); return -1; @@ -265,7 +265,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js #endif return nBytesRead; } - ThrowException( env, + ThrowException( env, "java/io/IOException", "Stream is not valid"); return -1; @@ -354,7 +354,7 @@ SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStor #endif return nRet; } - ThrowException( env, + ThrowException( env, "java/io/IOException", "No InputStream"); return -1; @@ -450,7 +450,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst { Sequence< ::sal_Int8 > aData(buf + off,len); env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT); - xOut->writeBytes(aData); + xOut->writeBytes(aData); #ifdef HSQLDB_DBG if ( logger ) logger->write( aData.getConstArray(), len ); @@ -459,7 +459,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst } else { - ThrowException( env, + ThrowException( env, "java/io/IOException", "No OutputStream"); } @@ -518,7 +518,7 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j } else { - ThrowException( env, + ThrowException( env, "java/io/IOException", "No OutputStream"); } diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 9f5a1dbd44b7..72722d5645f3 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.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 @@ -355,7 +355,7 @@ namespace connectivity env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr()); } //........................................................................ - } // namespace hsqldb + } // namespace hsqldb //........................................................................ //........................................................................ } diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 3d4373542e08..8b426adfaa75 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.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 @@ -64,24 +64,24 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, - const Reference< XConnection >& _xConnection) +OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, + const Reference< XConnection >& _xConnection) :OTableHelper(_pTables,_xConnection,sal_True) { // we create a new table here, so we should have all the rights or ;-) - m_nPrivileges = Privilege::DROP | - Privilege::REFERENCE | - Privilege::ALTER | - Privilege::CREATE | - Privilege::READ | - Privilege::DELETE | - Privilege::UPDATE | - Privilege::INSERT | + m_nPrivileges = Privilege::DROP | + Privilege::REFERENCE | + Privilege::ALTER | + Privilege::CREATE | + Privilege::READ | + Privilege::DELETE | + Privilege::UPDATE | + Privilege::INSERT | Privilege::SELECT; construct(); } // ------------------------------------------------------------------------- -OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, +OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, @@ -89,7 +89,7 @@ OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, const ::rtl::OUString& _SchemaName, const ::rtl::OUString& _CatalogName, sal_Int32 _nPrivileges - ) : OTableHelper( _pTables, + ) : OTableHelper( _pTables, _xConnection, sal_True, _Name, @@ -106,7 +106,7 @@ void OHSQLTable::construct() { OTableHelper::construct(); if ( !isNew() ) - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OHSQLTable::createArrayHelper( sal_Int32 /*_nId*/ ) const @@ -188,26 +188,26 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con ::dbtools::OPropertyMap& rProp = OMetaConnection::getPropMap(); // type/typename - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sOldTypeName; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sOldTypeName; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME))>>= sNewTypeName; // and precsions and scale - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nOldPrec; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nOldPrec; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_PRECISION))>>= nNewPrec; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nOldScale; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nNewScale; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nOldScale; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nNewScale; // second: check the "is nullable" value sal_Int32 nOldNullable = 0,nNewNullable = 0; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nOldNullable; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nOldNullable; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable; // check also the auto_increment sal_Bool bOldAutoIncrement = sal_False,bAutoIncrement = sal_False; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bOldAutoIncrement; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bOldAutoIncrement; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; // now we should look if the name of the column changed ::rtl::OUString sNewColumnName; @@ -228,10 +228,10 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con if ( nOldType != nNewType || sOldTypeName != sNewTypeName - || nOldPrec != nNewPrec - || nOldScale != nNewScale - || nNewNullable != nOldNullable - || bOldAutoIncrement != bAutoIncrement ) + || nOldPrec != nNewPrec + || nOldScale != nNewScale + || nNewNullable != nOldNullable + || bOldAutoIncrement != bAutoIncrement ) { // special handling because they change the type names to distinguish // if a column should be an auto_incmrement one @@ -244,7 +244,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con // third: check the default values ::rtl::OUString sNewDefault,sOldDefault; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault; if(sOldDefault.getLength()) diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index 44ce6dfbecc9..ea2521a633b8 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.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 @@ -70,7 +70,7 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) Sequence< ::rtl::OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; - sTableTypes[2] = s_sAll; // just to be sure to include anything else .... + sTableTypes[2] = s_sAll; // just to be sure to include anything else .... Any aCatalog; if ( sCatalog.getLength() ) diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx index 070d5e8be5cb..b2f23d8d5119 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.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 @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" - + #include "HTerminateListener.hxx" #include "hsqldb/HDriver.hxx" @@ -61,7 +61,7 @@ throw( RuntimeException ) } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx index b8af49d66dc8..681985951e49 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.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 namespace hsqldb { class ODriverDelegator; - class OConnectionController : public ::cppu::WeakImplHelper1< + class OConnectionController : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XTerminateListener > { ODriverDelegator* m_pDriver; @@ -60,7 +60,7 @@ namespace connectivity }; } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_HSQLDB_TERMINATELISTENER_HXX diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx index f3849359f80f..8f35c9246aeb 100644 --- a/connectivity/source/drivers/hsqldb/HTools.cxx +++ b/connectivity/source/drivers/hsqldb/HTools.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/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index bfc9d5a44144..840e54d3f6eb 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.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 @@ -47,7 +47,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True) +OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True) ,m_xConnection(_xConnection) { construct(); @@ -65,15 +65,15 @@ void OHSQLUser::refreshGroups() { } // ------------------------------------------------------------------------- -OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OHSQLUser(_xConnection) +OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OHSQLUser(_xConnection) { construct(); } // ------------------------------------------------------------------------- -typedef connectivity::sdbcx::OUser OUser_TYPEDEF; +typedef connectivity::sdbcx::OUser OUser_TYPEDEF; void OUserExtend::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } // ----------------------------------------------------------------------------- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const @@ -118,7 +118,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, xRes = xMeta->getTablePrivileges(aCatalog,sSchema,sTable); } break; - + case PrivilegeObject::COLUMN: { Any aCatalog; @@ -128,29 +128,29 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, } break; } - + if ( xRes.is() ) { - static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); - static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); - static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); - static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); - static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); - static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); - static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); + static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); + static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); + static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); + static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); + static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); + static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); + static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); static const ::rtl::OUString sREFERENCE = ::rtl::OUString::createFromAscii("REFERENCE"); - static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); - static const ::rtl::OUString sYes = ::rtl::OUString::createFromAscii("YES"); + static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); + static const ::rtl::OUString sYes = ::rtl::OUString::createFromAscii("YES"); nRightsWithGrant = nRights = 0; Reference<XRow> xCurrentRow(xRes,UNO_QUERY); while( xCurrentRow.is() && xRes->next() ) { - ::rtl::OUString sGrantee = xCurrentRow->getString(5); - ::rtl::OUString sPrivilege = xCurrentRow->getString(6); - ::rtl::OUString sGrantable = xCurrentRow->getString(7); - + ::rtl::OUString sGrantee = xCurrentRow->getString(5); + ::rtl::OUString sPrivilege = xCurrentRow->getString(6); + ::rtl::OUString sGrantable = xCurrentRow->getString(7); + if (!m_Name.equalsIgnoreAsciiCase(sGrantee)) continue; @@ -217,7 +217,7 @@ sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const ::rtl::OUString& obj { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); - + sal_Int32 nRights,nRightsWithGrant; findPrivilegesAndGrantPrivileges(objName,objType,nRights,nRightsWithGrant); return nRightsWithGrant; @@ -231,7 +231,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_In const ::rtl::OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_GRANTED)); ::dbtools::throwGenericSQLException(sError,*this); } // if ( objType != PrivilegeObject::TABLE ) - + ::osl::MutexGuard aGuard(m_aMutex); @@ -246,7 +246,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_In sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); sGrant += ::rtl::OUString::createFromAscii(" TO "); sGrant += m_Name; - + Reference<XStatement> xStmt = m_xConnection->createStatement(); if(xStmt.is()) xStmt->execute(sGrant); @@ -276,7 +276,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_I sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); sGrant += ::rtl::OUString::createFromAscii(" FROM "); sGrant += m_Name; - + Reference<XStatement> xStmt = m_xConnection->createStatement(); if(xStmt.is()) xStmt->execute(sGrant); @@ -296,7 +296,7 @@ void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/, sAlterPwd += newPassword; sAlterPwd += ::rtl::OUString::createFromAscii("')") ; - + Reference<XStatement> xStmt = m_xConnection->createStatement(); if ( xStmt.is() ) { @@ -310,35 +310,35 @@ void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/, ::rtl::OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) sPrivs += ::rtl::OUString::createFromAscii("INSERT"); - + if((nRights & Privilege::DELETE) == Privilege::DELETE) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("DELETE"); } - + if((nRights & Privilege::UPDATE) == Privilege::UPDATE) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("UPDATE"); } - + if((nRights & Privilege::ALTER) == Privilege::ALTER) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("ALTER"); } - + if((nRights & Privilege::SELECT) == Privilege::SELECT) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("SELECT"); } - + if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE) { if(sPrivs.getLength()) diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index e9c2ead9d733..6e91008f1dc7 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.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 @@ -44,7 +44,7 @@ using namespace connectivity; using namespace connectivity::hsqldb; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -54,7 +54,7 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - connectivity::sdbcx::IRefreshableUsers* _pParent) + connectivity::sdbcx::IRefreshableUsers* _pParent) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector) ,m_xConnection(_xConnection) ,m_pParent(_pParent) @@ -81,8 +81,8 @@ Reference< XPropertySet > OUsers::createDescriptor() // XAppend sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("GRANT USAGE ON * TO "); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("GRANT USAGE ON * TO "); + ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sUserName( _rForName ); aSql += ::dbtools::quoteName(aQuote,sUserName) + ::rtl::OUString::createFromAscii(" @\"%\" "); @@ -107,8 +107,8 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const void OUsers::dropObject(sal_Int32 /*nPos*/,const ::rtl::OUString _sElementName) { { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("REVOKE ALL ON * FROM "); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("REVOKE ALL ON * FROM "); + ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); aSql += ::dbtools::quoteName(aQuote,_sElementName); Reference< XStatement > xStmt = m_xConnection->createStatement( ); diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx index 86f0ddfcca46..1596ee70259f 100644 --- a/connectivity/source/drivers/hsqldb/HView.cxx +++ b/connectivity/source/drivers/hsqldb/HView.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/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index 1ead660ac9be..2c8c429d87dd 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.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 @@ -76,8 +76,8 @@ sdbcx::ObjectType HViews::createObject(const ::rtl::OUString& _rName) ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); return new HView( m_xConnection, isCaseSensitive(), sSchema, sTable ); @@ -120,10 +120,10 @@ void HViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) if (!bIsNew) { ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW"); - + Reference<XPropertySet> xProp(xObject,UNO_QUERY); aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true ); - + Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection(); Reference< XStatement > xStmt = xConnection->createStatement( ); xStmt->execute(aSql); @@ -142,8 +142,8 @@ void HViews::createView( const Reference< XPropertySet >& descriptor ) { Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection(); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW "); - ::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW "); + ::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sSchema,sCommand; aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index fd21de93b1d9..12fd647576ed 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.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 @@ -117,8 +117,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 5a51e6d9bb7f..532d7ca0de97 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.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/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index b9b78a675936..be64f013d71b 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.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 @@ -153,7 +153,7 @@ SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNa #endif if ( n < 0 ) - ThrowException( env, + ThrowException( env, "java/io/IOException", "n < 0"); @@ -198,7 +198,7 @@ SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNa } else { - ThrowException( env, + ThrowException( env, "java/io/IOException", "Stream is not valid"); } @@ -240,7 +240,7 @@ SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNat } else { - ThrowException( env, + ThrowException( env, "java/io/IOException", "Stream is not valid"); } diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx index 4ef88ff7bdca..36ec342e3291 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.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/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx index a80350eef30c..111e1da186c1 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.cxx +++ b/connectivity/source/drivers/hsqldb/accesslog.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/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx index d29e67c2aa37..f10ae77d4e3e 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.hxx +++ b/connectivity/source/drivers/hsqldb/accesslog.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/source/drivers/hsqldb/hsqldb.map b/connectivity/source/drivers/hsqldb/hsqldb.map index b4fc53b320ef..a13f907752e6 100644 --- a/connectivity/source/drivers/hsqldb/hsqldb.map +++ b/connectivity/source/drivers/hsqldb/hsqldb.map @@ -19,7 +19,7 @@ UDK_3_0_0 { Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt; Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek; Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write; - Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt; + Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII; diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xcu b/connectivity/source/drivers/hsqldb/hsqldb.xcu index f97b5e357179..af9c34824263 100755 --- a/connectivity/source/drivers/hsqldb/hsqldb.xcu +++ b/connectivity/source/drivers/hsqldb/hsqldb.xcu @@ -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,7 +66,7 @@ <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> </prop> - </node> + </node> <node oor:name="AutoIncrementIsPrimaryKey" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xml b/connectivity/source/drivers/hsqldb/hsqldb.xml index c456c253777d..f8e5c61af6de 100644 --- a/connectivity/source/drivers/hsqldb/hsqldb.xml +++ b/connectivity/source/drivers/hsqldb/hsqldb.xml @@ -12,7 +12,7 @@ <language>c++</language> <status value="final"/> <supported-service>com.sun.star.sdbcx.Driver</supported-service> - </component-description> + </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>sal</project-build-dependency> diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc index fe20ec5eaf21..052b603a7256 100644 --- a/connectivity/source/drivers/hsqldb/hsqlui.hrc +++ b/connectivity/source/drivers/hsqldb/hsqlui.hrc @@ -1,7 +1,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/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src index a2886c1a18cf..0e0189c5e278 100644 --- a/connectivity/source/drivers/hsqldb/hsqlui.src +++ b/connectivity/source/drivers/hsqldb/hsqlui.src @@ -1,7 +1,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 @@ If there were another possibility to ensure that the images are put into the repository, instead of creating a resource file for them, - then we would use this other way ... + then we would use this other way ... */ Image 1000 diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 3bdc4c261c66..db0a3bf5c06a 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.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 @@ -47,7 +47,7 @@ jclass java_sql_Array::getMyClass() const // die Klasse muss nur einmal geholt werden, daher statisch if( !theClass ) theClass = findMyClass("java/sql/Array"); - + return theClass; } @@ -67,7 +67,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: { jobjectArray out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); static const char * cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;"; @@ -87,7 +87,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: { jobjectArray out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jobject obj = convertTypeMapToJavaMap(t.pEnv,typeMap); static const char * cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;"; @@ -122,7 +122,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: t.pEnv->DeleteLocalRef(obj); } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - // return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out ); + // return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out ); return NULL; } @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: t.pEnv->DeleteLocalRef(obj); } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - // return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out ); + // return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out ); return NULL; } diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx index a8b8f88333a7..d523786a31c3 100644 --- a/connectivity/source/drivers/jdbc/Blob.cxx +++ b/connectivity/source/drivers/jdbc/Blob.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 @@ -63,7 +63,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { // temporaere Variable initialisieren static const char * cSignature = "()J"; @@ -99,7 +99,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx } } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return aSeq; + return aSeq; } ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) @@ -115,7 +115,7 @@ sal_Int64 SAL_CALL java_sql_Blob::position( const ::com::sun::star::uno::Sequenc { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { // temporaere Variable initialisieren static const char * cSignature = "([BI)J"; diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx index 5954ceae1cfe..b69ef1a73b28 100644 --- a/connectivity/source/drivers/jdbc/Boolean.cxx +++ b/connectivity/source/drivers/jdbc/Boolean.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/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index 420d6c34d813..293bb7e9ba65 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.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 @@ -44,7 +44,7 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -73,7 +73,7 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) th // ------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XRow > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XRow > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XOutParameters > *)0 )); return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes()); @@ -214,7 +214,7 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { createStatement(t.pEnv); @@ -235,7 +235,7 @@ void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { createStatement(t.pEnv); // temporaere Variable initialisieren diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx index d34ead197798..e1e6d8d8f485 100644 --- a/connectivity/source/drivers/jdbc/Class.cxx +++ b/connectivity/source/drivers/jdbc/Class.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 @@ -54,7 +54,7 @@ java_lang_Class * java_lang_Class::forName( const ::rtl::OUString& _par0 ) { jobject out(NULL); SDBThreadAttach t; - + { ::rtl::OString sClassName = ::rtl::OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8); sClassName = sClassName.replace('.','/'); diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index ed5b547b84d4..69b1e3425358 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.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 @@ -64,7 +64,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::length" ); jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { // temporaere Variable initialisieren static const char * cSignature = "()J"; @@ -95,7 +95,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx aStr = JavaString2String(t.pEnv,out); } //t.pEnv // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! - return aStr; + return aStr; } ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) @@ -114,7 +114,7 @@ sal_Int64 SAL_CALL java_sql_Clob::position( const ::rtl::OUString& searchstr, sa RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::position" ); jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jvalue args[1]; // Parameter konvertieren diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx index 2fea1cea6d14..c50d4bdc9e58 100644 --- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx +++ b/connectivity/source/drivers/jdbc/ConnectionLog.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/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx index 36ff7a067cc4..da1802f710c9 100644 --- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx +++ b/connectivity/source/drivers/jdbc/ContextClassLoader.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/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index de0e509ec66b..27d78332729e 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.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 @@ -54,7 +54,7 @@ using namespace ::com::sun::star::lang; //************ Class: java.sql.DatabaseMetaData //************************************************************** -jclass java_sql_DatabaseMetaData::theClass = 0; +jclass java_sql_DatabaseMetaData::theClass = 0; java_sql_DatabaseMetaData::~java_sql_DatabaseMetaData() { @@ -128,7 +128,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( jobject out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { // Java-Call absetzen static jmethodID mID(NULL); @@ -213,7 +213,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( if ( t.pEnv->IsInstanceOf( jThrow,java_sql_SQLException_BASE::st_getMyClass() ) ) { java_sql_SQLException_BASE* pException = new java_sql_SQLException_BASE( t.pEnv, jThrow ); - SQLException e( pException->getMessage(), + SQLException e( pException->getMessage(), *this, pException->getSQLState(), pException->getErrorCode(), @@ -319,7 +319,7 @@ sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength( ) throw(SQ return impl_callIntMethod( "getMaxTableNameLength", mID ); } // ------------------------------------------------------------------------- -sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw( ) +sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxTablesInSelect", mID ); @@ -357,7 +357,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( jobject out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { // Java-Call absetzen static jmethodID mID(NULL); @@ -398,7 +398,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier jobject out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { // Java-Call absetzen static jmethodID mID(NULL); @@ -635,7 +635,7 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_sql_DatabaseMetaData::impl_callResultSetMethodWithStrings: no Java enviroment anymore!" ); - + { const char* pSignature = _pOptionalAdditionalString ? "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/ResultSet;" @@ -644,7 +644,7 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS obtainMethodId(t.pEnv, _pMethodName,pSignature, _inout_MethodID); // call method - + { jvalue args[4]; // convert parameters @@ -699,7 +699,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers( ) thro return impl_callBooleanMethod( "storesLowerCaseIdentifiers", mID ); } // ------------------------------------------------------------------------- -sal_Bool java_sql_DatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +sal_Bool java_sql_DatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { static jmethodID mID(NULL); return impl_callBooleanMethod( "storesMixedCaseQuotedIdentifiers", mID ); @@ -873,7 +873,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions( return impl_callBooleanMethod( "supportsSchemasInIndexDefinitions", mID ); } // ------------------------------------------------------------------------- -sal_Bool java_sql_DatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) +sal_Bool java_sql_DatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsSchemasInTableDefinitions", mID ); @@ -891,7 +891,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions( return impl_callBooleanMethod( "supportsCatalogsInIndexDefinitions", mID ); } // ------------------------------------------------------------------------- -sal_Bool java_sql_DatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) +sal_Bool java_sql_DatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsCatalogsInDataManipulation", mID ); @@ -909,7 +909,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes( ) th return impl_callResultSetMethod( "getTableTypes", mID ); } // ------------------------------------------------------------------------- -sal_Int32 java_sql_DatabaseMetaData::impl_getMaxStatements_throw( ) +sal_Int32 java_sql_DatabaseMetaData::impl_getMaxStatements_throw( ) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxStatements", mID ); @@ -1007,7 +1007,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType jboolean out( sal_False ); SDBThreadAttach t; - + { static jmethodID mID(NULL); obtainMethodId(t.pEnv, pMethodName,"(II)Z", mID); @@ -1349,11 +1349,11 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_I jboolean out( sal_False ); SDBThreadAttach t; - + { static jmethodID mID(NULL); obtainMethodId(t.pEnv, pMethodName,"(II)Z", mID); - out = t.pEnv->CallBooleanMethod( object, mID, setType, concurrency); + out = t.pEnv->CallBooleanMethod( object, mID, setType, concurrency); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx index 258302d83783..24c4a7e9cc58 100644 --- a/connectivity/source/drivers/jdbc/Date.cxx +++ b/connectivity/source/drivers/jdbc/Date.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/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx index c4571f2f7fef..e39682d0c618 100644 --- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.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 @@ -35,7 +35,7 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -75,7 +75,7 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() { ::rtl::OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jfieldID id = t.pEnv->GetFieldID(getMyClass(),"name","Ljava/lang/String;"); if(id) @@ -88,7 +88,7 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() { ::rtl::OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jfieldID id = t.pEnv->GetFieldID(getMyClass(),"description","Ljava/lang/String;"); if(id) @@ -101,7 +101,7 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo() { ::rtl::OUString aStr; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jfieldID id = t.pEnv->GetFieldID(getMyClass(),"value","Ljava/lang/String;"); if(id) @@ -114,7 +114,7 @@ sal_Bool java_sql_DriverPropertyInfo::required() { jboolean out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jfieldID id = t.pEnv->GetFieldID(getMyClass(),"required","Z"); if(id) @@ -126,7 +126,7 @@ sal_Bool java_sql_DriverPropertyInfo::required() Sequence< ::rtl::OUString> java_sql_DriverPropertyInfo::choices() { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jfieldID id = t.pEnv->GetFieldID(getMyClass(),"choices","[Ljava/lang/String;"); if(id) diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx index ba65dab09b3b..682c01ac2b05 100644 --- a/connectivity/source/drivers/jdbc/Exception.cxx +++ b/connectivity/source/drivers/jdbc/Exception.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/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index 8e335d66ca2b..d1741c7e588f 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.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 @@ -87,7 +87,7 @@ sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequen jint out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jbyteArray pByteArray = t.pEnv->NewByteArray(nBytesToRead); static const char * cSignature = "([BII)I"; diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx index 25d5837b0f5e..81451382ba14 100644 --- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx +++ b/connectivity/source/drivers/jdbc/JBigDecimal.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/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index b61e2e6e76a4..a8ed19cd87f6 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.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 @@ -279,7 +279,7 @@ java_sql_Connection::java_sql_Connection( const java_sql_Driver& _rDriver ) ,m_bParameterSubstitution(sal_False) ,m_bIgnoreDriverPrivileges(sal_True) ,m_bIgnoreCurrency(sal_False) -{ +{ } // ----------------------------------------------------------------------------- java_sql_Connection::~java_sql_Connection() @@ -289,7 +289,7 @@ java_sql_Connection::~java_sql_Connection() { SDBThreadAttach t; clearObject(*t.pEnv); - + { if ( m_pDriverobject ) t.pEnv->DeleteGlobalRef( m_pDriverobject ); @@ -486,7 +486,7 @@ Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw( ::rtl::OUString sNewSql; OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sSQL); if(pNode) - { // special handling for parameters + { // special handling for parameters OSQLParseNode::substituteParameterNames(pNode); pNode->parseNodeToStr( sNewSql, this ); delete pNode; @@ -581,7 +581,7 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! if( out ) { - java_sql_SQLWarning_BASE warn_base(t.pEnv, out); + java_sql_SQLWarning_BASE warn_base(t.pEnv, out); SQLException aAsException( static_cast< starsdbc::SQLException >( java_sql_SQLWarning( warn_base, *this ) ) ); // translate to warning @@ -591,7 +591,7 @@ Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeExc aWarning.SQLState = aAsException.SQLState; aWarning.ErrorCode = aAsException.ErrorCode; aWarning.NextException = aAsException.NextException; - + return makeAny( aWarning ); } @@ -670,9 +670,9 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri const Sequence< NamedValue >& _rSystemProperties ) { // contains the statement which should be used when query for automatically generated values - ::rtl::OUString sGeneratedValueStatement; + ::rtl::OUString sGeneratedValueStatement; // set to <TRUE/> when we should allow to query for generated values - sal_Bool bAutoRetrievingEnabled = sal_False; + sal_Bool bAutoRetrievingEnabled = sal_False; // first try if the jdbc driver is alraedy registered at the driver manager SDBThreadAttach t; @@ -730,7 +730,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri if( t.pEnv && m_pDriverobject ) m_pDriverobject = t.pEnv->NewGlobalRef( m_pDriverobject ); - + { jclass tempClass = t.pEnv->GetObjectClass(m_pDriverobject); if ( m_pDriverobject ) @@ -761,7 +761,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri *this ); } - + enableAutoRetrievingEnabled( bAutoRetrievingEnabled ); setAutoRetrievingStatement( sGeneratedValueStatement ); } @@ -789,12 +789,12 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url, throwGenericSQLException(STR_NO_JAVA,*this); } SDBThreadAttach t; - t.addRef(); // will be released in dtor + t.addRef(); // will be released in dtor if ( !t.pEnv ) throwGenericSQLException(STR_NO_JAVA,*this); - ::rtl::OUString sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values - sal_Bool bAutoRetrievingEnabled = sal_False; // set to <TRUE/> when we should allow to query for generated values + ::rtl::OUString sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values + sal_Bool bAutoRetrievingEnabled = sal_False; // set to <TRUE/> when we should allow to query for generated values ::rtl::OUString sDriverClassPath,sDriverClass; Sequence< NamedValue > aSystemProperties; diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 18ea813b25a1..c56aba87405b 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.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/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 8a73592c2be8..bde76228d3b6 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.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 @@ -139,7 +139,7 @@ Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -173,11 +173,11 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) { // ignore } - + Reference< XResultSet > xRes; if ( !out ) { - OSL_ENSURE( m_pConnection && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!"); + OSL_ENSURE( m_pConnection && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!"); if ( m_pConnection ) { ::rtl::OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement); @@ -271,7 +271,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const :: jobject out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { createStatement(t.pEnv); m_sSqlStatement = sql; @@ -367,7 +367,7 @@ Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base createStatement(t.pEnv); static jmethodID mID(NULL); jobject out = callResultSetMethod(t.env(),"getResultSet",mID); - + // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this ); } @@ -401,7 +401,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sd // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! if( out ) { - java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); + java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); return makeAny( static_cast< starsdbc::SQLException >( java_sql_SQLWarning(warn_base,*(::cppu::OWeakObject*)this))); @@ -415,7 +415,7 @@ void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(::com::sun::star: ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); SDBThreadAttach t; - + { createStatement(t.pEnv); static jmethodID mID(NULL); @@ -606,12 +606,12 @@ void java_sql_Statement_Base::setCursorName(const ::rtl::OUString &_par0) throw( Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -655,7 +655,7 @@ sal_Bool java_sql_Statement_Base::convertFastPropertyValue( case PROPERTY_ID_ESCAPEPROCESSING: return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bEscapeProcessing ); case PROPERTY_ID_USEBOOKMARKS: - // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); + // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); default: ; } @@ -698,7 +698,7 @@ void java_sql_Statement_Base::setFastPropertyValue_NoBroadcast( setEscapeProcessing( ::comphelper::getBOOL( rValue ) ); break; case PROPERTY_ID_USEBOOKMARKS: - // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); + // return ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bAsLink); default: ; } diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 5b342a2e4f2a..3a7184393fb6 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.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 @@ -342,7 +342,7 @@ void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmet { SDBThreadAttach t; OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" ); - + // call method jstring out = (jstring)callObjectMethod(t.pEnv,_pMethodName,"()Ljava/lang/String;", _inout_MethodID); return JavaString2String( t.pEnv, out ); diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 3ca4cfbc0c29..21092d5148d5 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.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 @@ -83,7 +83,7 @@ jclass java_sql_PreparedStatement::getMyClass() const ::com::sun::star::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Any aRet = OStatement_BASE2::queryInterface(rType); - return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, + return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, static_cast< XPreparedStatement*>(this), static_cast< XParameters*>(this), static_cast< XResultSetMetaDataSupplier*>(this), @@ -92,7 +92,7 @@ jclass java_sql_PreparedStatement::getMyClass() const // ------------------------------------------------------------------------- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedBatchExecution > *)0 )); @@ -129,7 +129,7 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c m_aLogger.log( LogLevel::FINER, STR_LOG_STRING_PARAMETER, parameterIndex, x ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - { // temporaere Variable initialisieren + { // temporaere Variable initialisieren createStatement(t.pEnv); static const char * cSignature = "(ILjava/lang/String;)V"; static const char * cMethodName = "setString"; diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index 12ec9e8f9cd5..6bf9bf9b9f95 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.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 @@ -70,7 +70,7 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::Not { jboolean out(sal_False); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { static const char * cSignature = "()Z"; static const char * cMethodName = "available"; @@ -94,7 +94,7 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< s OSL_ENSURE(aData.getLength() < nBytesToRead," Sequence is smaller than BytesToRead"); jint out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); - + { jcharArray pCharArray = t.pEnv->NewCharArray(nBytesToRead); static const char * cSignature = "([CII)I"; diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx index cb86ebd08c9b..82a4aa418a44 100644 --- a/connectivity/source/drivers/jdbc/Ref.cxx +++ b/connectivity/source/drivers/jdbc/Ref.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/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index b2d72cb24d50..b71f145183c5 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.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 @@ -65,7 +65,7 @@ using namespace ::comphelper; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -140,7 +140,7 @@ m_xMetaData.clear(); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getTypes" ); - ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -161,7 +161,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBinaryStream","(I)Ljava/io/InputStream;", mID, columnIndex); - + // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! return out==0 ? 0 : new java_io_InputStream( t.pEnv, out ); } @@ -172,7 +172,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getCharacterStream","(I)Ljava/io/Reader;", mID, columnIndex); - + // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! return out==0 ? 0 : new java_io_Reader( t.pEnv, out ); } @@ -283,7 +283,7 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getArray","(I)Ljava/sql/Array;", mID, columnIndex); - + // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! return out==0 ? 0 : new java_sql_Array( t.pEnv, out ); } @@ -316,7 +316,7 @@ Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) t SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); jobject out = callObjectMethodWithIntArg(t.pEnv,"getRef","(I)Ljava/sql/Ref;", mID, columnIndex); - + // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! return out==0 ? 0 : new java_sql_Ref( t.pEnv, out ); } @@ -343,7 +343,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen obtainMethodId(t.pEnv, cMethodName,cSignature, mID); } - + out = t.pEnv->CallObjectMethodA( object, mID, args); t.pEnv->DeleteLocalRef((jstring)args[1].l); ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); @@ -582,7 +582,7 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! if( out ) { - java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); + java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); return makeAny( static_cast< starsdbc::SQLException >( java_sql_SQLWarning(warn_base,*this))); @@ -704,7 +704,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::r { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::updateString" ); SDBThreadAttach t; - + { // temporaere Variable initialisieren @@ -717,7 +717,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::r obtainMethodId(t.pEnv, cMethodName,cSignature, mID); } - + { // Parameter konvertieren jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,x)); @@ -732,7 +732,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::updateBytes" ); SDBThreadAttach t; - + { // temporaere Variable initialisieren // Java-Call absetzen @@ -744,7 +744,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co obtainMethodId(t.pEnv, cMethodName,cSignature, mID); } - + { jbyteArray aArray = t.pEnv->NewByteArray(x.getLength()); t.pEnv->SetByteArrayRegion(aArray,0,x.getLength(),(jbyte*)x.getConstArray()); @@ -801,7 +801,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con static const char * cMethodName = "updateBinaryStream"; obtainMethodId(t.pEnv, cMethodName,cSignature, mID); } - + { // Parameter konvertieren jobject obj = createByteInputStream(x,length); @@ -812,8 +812,8 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con } catch(Exception) { - ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateBinaryStream", *this ); - } + ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateBinaryStream", *this ); + } } // ------------------------------------------------------------------------- void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) @@ -833,7 +833,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, static const char * cMethodName = "updateCharacterStream"; obtainMethodId(t.pEnv, cMethodName,cSignature, mID); } - + { // Parameter konvertieren jobject obj = createCharArrayReader(x,length); @@ -844,7 +844,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, } catch(Exception) { - ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateCharacterStream", *this ); + ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateCharacterStream", *this ); } } // ------------------------------------------------------------------------- @@ -866,11 +866,11 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::updateNumericObject" ); - // OSL_ENSURE(0,"java_sql_ResultSet::updateNumericObject: NYI"); + // OSL_ENSURE(0,"java_sql_ResultSet::updateNumericObject: NYI"); try { SDBThreadAttach t; - + { // temporaere Variable initialisieren @@ -883,7 +883,7 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co obtainMethodId(t.pEnv, cMethodName,cSignature, mID); } - + { // Parameter konvertieren double nTemp = 0.0; @@ -920,7 +920,7 @@ sal_Int32 java_sql_ResultSet::getResultSetType() const throw(::com::sun::star::s return callIntMethod("getType",mID,true); } //------------------------------------------------------------------------------ -sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getFetchDirection" ); static jmethodID mID(NULL); @@ -969,11 +969,11 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s Sequence< Property > aProps(5); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); - DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); + DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); return new ::cppu::OPropertyArrayHelper(aProps); } diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index c922f77f4664..6bbe0d493d02 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.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 @@ -36,7 +36,7 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx index 0a9e2712d070..93dd658da42b 100644 --- a/connectivity/source/drivers/jdbc/SQLException.cxx +++ b/connectivity/source/drivers/jdbc/SQLException.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 @@ -34,7 +34,7 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -42,7 +42,7 @@ using namespace ::com::sun::star::lang; //************ Class: java.sql.SQLException //************************************************************** java_sql_SQLException::java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const Reference< XInterface> & _rContext) - : starsdbc::SQLException( _rException.getMessage(), + : starsdbc::SQLException( _rException.getMessage(), _rContext, _rException.getSQLState(), _rException.getErrorCode(), @@ -81,7 +81,7 @@ starsdbc::SQLException java_sql_SQLException_BASE::getNextException() const // ACHTUNG: der Aufrufer wird Eigentuemer des zurueckgelieferten Zeigers !!! if( out ) { - java_sql_SQLException_BASE warn_base(t.pEnv,out); + java_sql_SQLException_BASE warn_base(t.pEnv,out); return (starsdbc::SQLException)java_sql_SQLException(warn_base,0); } diff --git a/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx index 85be40a6c342..ac01b0e2f39a 100644 --- a/connectivity/source/drivers/jdbc/SQLWarning.cxx +++ b/connectivity/source/drivers/jdbc/SQLWarning.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/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx index 18af00d67171..a2155054f13c 100644 --- a/connectivity/source/drivers/jdbc/String.cxx +++ b/connectivity/source/drivers/jdbc/String.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/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx index 40713ed10beb..0ae5b66b6b0d 100644 --- a/connectivity/source/drivers/jdbc/Throwable.cxx +++ b/connectivity/source/drivers/jdbc/Throwable.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/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index 27f7734cf63d..6474e9cfc3ec 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.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/source/drivers/jdbc/jdbc.xcu b/connectivity/source/drivers/jdbc/jdbc.xcu index f4f599a701d9..49ae3b401580 100755 --- a/connectivity/source/drivers/jdbc/jdbc.xcu +++ b/connectivity/source/drivers/jdbc/jdbc.xcu @@ -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/source/drivers/jdbc/jdbc.xml b/connectivity/source/drivers/jdbc/jdbc.xml index bdce638fcf0f..8fe04eb8a5b1 100644 --- a/connectivity/source/drivers/jdbc/jdbc.xml +++ b/connectivity/source/drivers/jdbc/jdbc.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding="UTF-8"?> <!DOCTYPE module-description PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> jdbc </module-name> + <module-name> jdbc </module-name> <component-description> <author>Ocke Janssen</author> <name>com.sun.star.comp.sdbc.JDBCDriver</name> @@ -11,9 +11,9 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service> com.sun.star.sdbc.Driver </supported-service> - <service-dependency> ... </service-dependency> - </component-description> + <supported-service> com.sun.star.sdbc.Driver </supported-service> + <service-dependency> ... </service-dependency> + </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>sal</project-build-dependency> diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 585464125b9d..5d0dc8e2ae39 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.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 @@ -115,8 +115,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index 2bd98c24751e..2485943db4b2 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.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 @@ -41,7 +41,7 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -50,7 +50,7 @@ void java_util_Properties::setProperty(const ::rtl::OUString key, const ::rtl::O { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); jobject out(0); - + { jvalue args[2]; // Parameter konvertieren @@ -116,8 +116,8 @@ jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const ::rtl::OUStr java_util_Properties* connectivity::createStringPropertyArray(const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { java_util_Properties* pProps = new java_util_Properties(); - const PropertyValue* pBegin = info.getConstArray(); - const PropertyValue* pEnd = pBegin + info.getLength(); + const PropertyValue* pBegin = info.getConstArray(); + const PropertyValue* pEnd = pBegin + info.getLength(); for(;pBegin != pEnd;++pBegin) { @@ -220,7 +220,7 @@ sal_Bool connectivity::isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear) } // ----------------------------------------------------------------------------- jobject connectivity::createByteInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length) -{ +{ SDBThreadAttach t; if( !t.pEnv || !x.is() ) return NULL; @@ -247,7 +247,7 @@ jobject connectivity::createByteInputStream(const ::com::sun::star::uno::Referen } // ----------------------------------------------------------------------------- jobject connectivity::createCharArrayReader(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length) -{ +{ SDBThreadAttach t; if( !t.pEnv || !x.is() ) return NULL; diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx index 99148afd5656..44d95d1e85e7 100644 --- a/connectivity/source/drivers/kab/KCatalog.cxx +++ b/connectivity/source/drivers/kab/KCatalog.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 @@ -105,7 +105,7 @@ Reference< XNameAccess > SAL_CALL KabCatalog::getTables( ) throw(RuntimeExcepti { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - + try { if (!m_pTables) diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx index 27f80caafc73..b24a0a92dbfa 100644 --- a/connectivity/source/drivers/kab/KCatalog.hxx +++ b/connectivity/source/drivers/kab/KCatalog.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 class KabCatalog : public connectivity::sdbcx::OCatalog { - KabConnection* m_pConnection; // used to get the metadata + KabConnection* m_pConnection; // used to get the metadata ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx index 398950c192ff..4fd9ca7cb9b7 100644 --- a/connectivity/source/drivers/kab/KColumns.cxx +++ b/connectivity/source/drivers/kab/KColumns.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 @@ -90,7 +90,7 @@ void KabColumns::impl_refresh() throw(RuntimeException) m_pTable->refreshColumns(); } // ------------------------------------------------------------------------- -KabColumns::KabColumns( KabTable* _pTable, +KabColumns::KabColumns( KabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(*_pTable, sal_True, _rMutex, _rVector), diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx index 6ab3d32a39ec..c31f0e165993 100644 --- a/connectivity/source/drivers/kab/KColumns.hxx +++ b/connectivity/source/drivers/kab/KColumns.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,13 +39,13 @@ namespace connectivity class KabColumns : public sdbcx::OCollection { protected: - KabTable* m_pTable; + KabTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - KabColumns( KabTable* _pTable, + KabColumns( KabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector); }; diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx index b9761ebe9cb8..d612eed46a53 100644 --- a/connectivity/source/drivers/kab/KConnection.cxx +++ b/connectivity/source/drivers/kab/KConnection.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 @@ -48,7 +48,7 @@ using namespace com::sun::star::sdbcx; IMPLEMENT_SERVICE_INFO(KabConnection, "com.sun.star.sdbc.drivers.KabConnection", "com.sun.star.sdbc.Connection") //----------------------------------------------------------------------------- -KabConnection::KabConnection(KabDriver* _pDriver) +KabConnection::KabConnection(KabDriver* _pDriver) : OMetaConnection_BASE(m_aMutex), OSubComponent<KabConnection, KabConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_xMetaData(NULL), diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index b58460c0a80d..df495478203d 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.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 @@ -60,7 +60,7 @@ namespace connectivity class KabDriver; class KabDatabaseMetaData; - typedef OMetaConnection_BASE KabConnection_BASE; // implements basics and text encoding + typedef OMetaConnection_BASE KabConnection_BASE; // implements basics and text encoding typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; class KabConnection : public comphelper::OBaseMutex, @@ -75,13 +75,13 @@ namespace connectivity //==================================================================== ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - OWeakRefArray m_aStatements; // vector containing a list of all the Statement objects + OWeakRefArray m_aStatements; // vector containing a list of all the Statement objects // for this Connection - ::KABC::StdAddressBook* m_pAddressBook; // the address book - KabDriver* m_pDriver; // pointer to the owning driver object + ::KABC::StdAddressBook* m_pAddressBook; // the address book + KabDriver* m_pDriver; // pointer to the owning driver object ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> - m_xCatalog; // needed for the SQL interpreter + m_xCatalog; // needed for the SQL interpreter public: virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); @@ -131,8 +131,8 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); // accessors - inline KabDriver* getDriver() const { return m_pDriver;} - ::KABC::AddressBook* getAddressBook() const; + inline KabDriver* getDriver() const { return m_pDriver;} + ::KABC::AddressBook* getAddressBook() const; }; } } diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx index 922b636337d4..7264f6086221 100644 --- a/connectivity/source/drivers/kab/KDEInit.cxx +++ b/connectivity/source/drivers/kab/KDEInit.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/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h index 9a5ea70da211..c1f3963561e2 100644 --- a/connectivity/source/drivers/kab/KDEInit.h +++ b/connectivity/source/drivers/kab/KDEInit.h @@ -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 @@ -30,9 +30,9 @@ #define CONNECTIVITY_KAB_KDEINIT_H // the address book driver's version -#define KAB_DRIVER_VERSION "0.2" -#define KAB_DRIVER_VERSION_MAJOR 0 -#define KAB_DRIVER_VERSION_MINOR 2 +#define KAB_DRIVER_VERSION "0.2" +#define KAB_DRIVER_VERSION_MAJOR 0 +#define KAB_DRIVER_VERSION_MINOR 2 // the minimum KDE version which is required at runtime #define MIN_KDE_VERSION_MAJOR 3 diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index 8ae1227a0062..a8b3f368f3ae 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.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 @@ -45,14 +45,14 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -KabDatabaseMetaData::KabDatabaseMetaData(KabConnection* _pCon) +KabDatabaseMetaData::KabDatabaseMetaData(KabConnection* _pCon) : m_xConnection(_pCon), m_bUseCatalog(sal_True) { OSL_ENSURE(_pCon,"KabDatabaseMetaData::KabDatabaseMetaData: No connection set!"); osl_incrementInterlockedCount( &m_refCount ); - m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); + m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); osl_decrementInterlockedCount( &m_refCount ); } // ------------------------------------------------------------------------- @@ -852,17 +852,17 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) throw(SQLEx return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( const Any&, const ::rtl::OUString&, - const ::rtl::OUString& tableNamePattern, + const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); @@ -907,7 +907,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( ::KABC::Field::List aFields = ::KABC::Field::allFields(); ::KABC::Field::List::iterator aField; - for ( aField = aFields.begin(); + for ( aField = aFields.begin(); aField != aFields.end(); ++aField, ++nPosition) { @@ -929,7 +929,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, @@ -980,25 +980,25 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns( - const Any&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures( - const Any&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures( + const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( const Any&, const ::rtl::OUString&, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); - + Reference< XResultSet > xRef = pResult; ODatabaseMetaDataResultSet::ORows aRows; @@ -1027,47 +1027,47 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const Any&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference( + const Any&, const ::rtl::OUString&, + const ::rtl::OUString&, const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index 2a3e130b6789..00b0bb64145d 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.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 @@ -45,8 +45,8 @@ namespace connectivity class KabDatabaseMetaData : public KabDatabaseMetaData_BASE { - ::com::sun::star::uno::Reference< KabConnection > m_xConnection; - sal_Bool m_bUseCatalog; + ::com::sun::star::uno::Reference< KabConnection > m_xConnection; + sal_Bool m_bUseCatalog; public: diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index df050f02812e..22368d60fcfe 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.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/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index e210bd7d5532..aa2d1f252ba4 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.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 @@ -158,11 +158,11 @@ namespace connectivity class KabDriver : public KDriver_BASE { protected: - ::osl::Mutex m_aMutex; // mutex is need to control member access - OWeakRefArray m_xConnections; // vector containing a list of all the + ::osl::Mutex m_aMutex; // mutex is need to control member access + OWeakRefArray m_xConnections; // vector containing a list of all the // KabConnection objects for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xMSFactory; // the multi-service factory + m_xMSFactory; // the multi-service factory KabImplModule m_aImplModule; public: diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index 2b1c13649b01..d82ca654d7ac 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.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 @@ -58,7 +58,7 @@ void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQL // ------------------------------------------------------------------------- void KabPreparedStatement::setKabFields() const throw(SQLException) { - ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns + ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns xColumns = m_aSQLIterator.getSelectColumns(); if (!xColumns.is()) @@ -137,7 +137,7 @@ void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - + // Reset last warning message try { clearWarnings (); @@ -165,7 +165,7 @@ sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, Run { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - + // same as in statement with the difference that this statement also can contain parameter return 0; } @@ -200,64 +200,64 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setObjectNull", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBoolean", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setByte", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setShort", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setInt", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setFloat", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } @@ -274,96 +274,96 @@ void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const :: // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBytes", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setDate", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setTime", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setTimestamp", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBinaryStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setCharacterStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException) -{ +{ if(!::dbtools::implSetObject(this,parameterIndex,x)) { throw SQLException(); - } + } } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setObjectWithInfo", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setRef", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBlob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setClob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setArray", NULL); } diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx index dfaf0407e238..876afb1719ec 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.hxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.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,7 +42,7 @@ namespace connectivity { class OBoundParam; - typedef ::cppu::ImplInheritanceHelper4< KabCommonStatement, + typedef ::cppu::ImplInheritanceHelper4< KabCommonStatement, ::com::sun::star::sdbc::XPreparedStatement, ::com::sun::star::sdbc::XParameters, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, @@ -51,12 +51,12 @@ namespace connectivity class KabPreparedStatement : public KabPreparedStatement_BASE { protected: - ::rtl::OUString m_sSqlStatement; + ::rtl::OUString m_sSqlStatement; ::rtl::Reference< KabResultSetMetaData > m_xMetaData; - sal_Bool m_bPrepared; - mutable sal_Int32 m_nParameterIndex; - OValueRow m_aParameterRow; + sal_Bool m_bPrepared; + mutable sal_Int32 m_nParameterIndex; + OValueRow m_aParameterRow; void checkAndResizeParameters(sal_Int32 nParams) throw(::com::sun::star::sdbc::SQLException); void setKabFields() const throw(::com::sun::star::sdbc::SQLException); diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index 7a7043eb34c6..1c1b8f35dc50 100644 --- a/connectivity/source/drivers/kab/KResultSet.cxx +++ b/connectivity/source/drivers/kab/KResultSet.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 @@ -54,7 +54,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(KabResultSet, "com.sun.star.sdbc.drivers.KabResultSet", "com.sun.star.sdbc.ResultSet"); // ------------------------------------------------------------------------- -KabResultSet::KabResultSet(KabCommonStatement* pStmt) +KabResultSet::KabResultSet(KabCommonStatement* pStmt) : KabResultSet_BASE(m_aMutex), OPropertySetHelper(KabResultSet_BASE::rBHelper), m_xStatement(pStmt), @@ -164,13 +164,13 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) t ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - // find the first column with the name columnName + // find the first column with the name columnName Reference< XResultSetMetaData > xMeta = getMetaData(); sal_Int32 nLen = xMeta->getColumnCount(); for (sal_Int32 i = 1; i <= nLen; ++i) if (xMeta->isCaseSensitive(i) ? - columnName == xMeta->getColumnName(i) : + columnName == xMeta->getColumnName(i) : columnName.equalsIgnoreAsciiCase(xMeta->getColumnName(i))) return i; @@ -180,7 +180,7 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) t "$columnname$",columnName ) ); ::dbtools::throwGenericSQLException(sError,NULL); - + // Unreachable: OSL_ASSERT(false); return 0; @@ -502,7 +502,7 @@ void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - + // move before the first row m_nRowPos = -1; } @@ -616,7 +616,7 @@ sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeExceptio } // ------------------------------------------------------------------------- sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeException) -{ +{ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -666,7 +666,7 @@ void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - + // only when you allow updates } // ------------------------------------------------------------------------- @@ -686,7 +686,7 @@ void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcepti { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - + // only when you allow inserts } // ------------------------------------------------------------------------- @@ -899,7 +899,7 @@ Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const Sequence< Any >& { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - + return Sequence< sal_Int32 >(); } // ------------------------------------------------------------------------- @@ -908,12 +908,12 @@ IPropertyArrayHelper* KabResultSet::createArrayHelper() const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); - DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); + DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); } diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index fc7e5f49ce26..209f9a1d6c3f 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.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,7 +46,7 @@ namespace connectivity namespace kab { /* - ** KabResultSet + ** KabResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -61,17 +61,17 @@ namespace connectivity ::com::sun::star::sdbc::XColumnLocate, ::com::sun::star::lang::XServiceInfo> KabResultSet_BASE; - class KabResultSet : public comphelper::OBaseMutex, - public KabResultSet_BASE, - public ::cppu::OPropertySetHelper, - public comphelper::OPropertyArrayUsageHelper<KabResultSet> + class KabResultSet : public comphelper::OBaseMutex, + public KabResultSet_BASE, + public ::cppu::OPropertySetHelper, + public comphelper::OPropertyArrayUsageHelper<KabResultSet> { protected: - ::rtl::Reference< KabCommonStatement > m_xStatement; // the statement that has created this result set - ::rtl::Reference< KabResultSetMetaData > m_xMetaData; // the description of the columns in this result set - ::KABC::Addressee::List m_aKabAddressees; // address book entries matching the query - sal_Int32 m_nRowPos; // the current row within the result set - sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL + ::rtl::Reference< KabCommonStatement > m_xStatement; // the statement that has created this result set + ::rtl::Reference< KabResultSetMetaData > m_xMetaData; // the description of the columns in this result set + ::KABC::Addressee::List m_aKabAddressees; // address book entries matching the query + sal_Int32 m_nRowPos; // the current row within the result set + sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; @@ -98,7 +98,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - + KabResultSet(KabCommonStatement *pStmt); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx index b4739d632352..c9bc2853f159 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.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/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx index 2e04fa84c8b6..5bf1dd2495a9 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.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 @@ -40,14 +40,14 @@ namespace connectivity namespace kab { /* - ** KabResultSetMetaData + ** KabResultSetMetaData */ typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> KabResultSetMetaData_BASE; class KabResultSetMetaData : public KabResultSetMetaData_BASE { - KabConnection* m_pConnection; - ::std::vector<sal_Int32> m_aKabFields; // for each selected column, contains the number + KabConnection* m_pConnection; + ::std::vector<sal_Int32> m_aKabFields; // for each selected column, contains the number // of the corresponding KAddressBook field protected: diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx index b2d4ef8f3da8..640f84d96d8b 100644 --- a/connectivity/source/drivers/kab/KServices.cxx +++ b/connectivity/source/drivers/kab/KServices.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 @@ -116,8 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index 4121681255fd..655e8ae656e2 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.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 @@ -70,7 +70,7 @@ namespace IMPLEMENT_SERVICE_INFO(KabStatement, "com.sun.star.sdbc.drivers.KabStatement", "com.sun.star.sdbc.Statement"); //------------------------------------------------------------------------------ -KabCommonStatement::KabCommonStatement(KabConnection* _pConnection ) +KabCommonStatement::KabCommonStatement(KabConnection* _pConnection ) : KabCommonStatement_BASE(m_aMutex), OPropertySetHelper(KabCommonStatement_BASE::rBHelper), m_aParser(_pConnection->getDriver()->getMSFactory()), @@ -144,9 +144,9 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse { ::rtl::OUString sMatchString; - if (pRight->isToken()) // WHERE Name = 'Doe' + if (pRight->isToken()) // WHERE Name = 'Doe' sMatchString = pRight->getTokenValue(); - else if (SQL_ISRULE(pRight, parameter)) // WHERE Name = ? + else if (SQL_ISRULE(pRight, parameter)) // WHERE Name = ? getNextParameter(sMatchString); switch (pMiddle->getNodeType()) @@ -189,10 +189,10 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse else if (SQL_ISRULE(pParseNode, test_for_null) || SQL_ISRULE(pParseNode, like_predicate)) { const OSQLParseNode *pLeft = pParseNode->getChild(0); - const OSQLParseNode* pPart2 = pParseNode->getChild(1); + const OSQLParseNode* pPart2 = pParseNode->getChild(1); const OSQLParseNode *pMiddleLeft = pPart2->getChild(0), *pMiddleRight = pPart2->getChild(1), - *pRight = pPart2->getChild(2); + *pRight = pPart2->getChild(2); if (SQL_ISRULE(pParseNode, test_for_null)) { @@ -230,9 +230,9 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse { ::rtl::OUString sMatchString; - if (pMiddleRight->isToken()) // WHERE Name LIKE 'Sm%' + if (pMiddleRight->isToken()) // WHERE Name LIKE 'Sm%' sMatchString = pMiddleRight->getTokenValue(); - else if (SQL_ISRULE(pMiddleRight, parameter)) // WHERE Name LIKE ? + else if (SQL_ISRULE(pMiddleRight, parameter)) // WHERE Name LIKE ? getNextParameter(sMatchString); return new KabConditionSimilar(sColumnName, sMatchString); @@ -311,8 +311,8 @@ sal_Bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const //------------------------------------------------------------------------------ void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLException) { - ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns - KabResultSetMetaData *pMeta; // meta information - holds the list of KAddressBook fields + ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns + KabResultSetMetaData *pMeta; // meta information - holds the list of KAddressBook fields xColumns = m_aSQLIterator.getSelectColumns(); if (!xColumns.is()) @@ -377,7 +377,7 @@ Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(Runt // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); @@ -397,7 +397,7 @@ void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - + } dispose(); } @@ -434,20 +434,20 @@ OSL_TRACE("KDE Address book - SQL Request: %s", OUtoCStr(sql)); switch (m_aSQLIterator.getStatementType()) { case SQL_STATEMENT_SELECT: - if (isTableKnown(pResult)) // FROM which table ? + if (isTableKnown(pResult)) // FROM which table ? { - setKabFields(pResult); // SELECT which columns ? - selectAddressees(pResult); // WHERE which condition ? - sortAddressees(pResult); // ORDER BY which columns ? + setKabFields(pResult); // SELECT which columns ? + selectAddressees(pResult); // WHERE which condition ? + sortAddressees(pResult); // ORDER BY which columns ? // To be continued: DISTINCT -// etc... +// etc... } break; default: // To be continued: UPDATE -// DELETE -// etc... +// DELETE +// etc... lcl_throwError(STR_QUERY_TOO_COMPLEX); } @@ -458,7 +458,7 @@ Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQ { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - + // just return our connection here return (Reference< XConnection >) m_pConnection; } @@ -467,8 +467,8 @@ sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const ::rtl::OUString& ) t { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - - // the return values gives information about how many rows are affected by executing the sql statement + + // the return values gives information about how many rows are affected by executing the sql statement return 0; } // ------------------------------------------------------------------------- @@ -495,12 +495,12 @@ void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeE Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -521,7 +521,7 @@ sal_Bool KabCommonStatement::convertFastPropertyValue( const Any&) throw (::com::sun::star::lang::IllegalArgumentException) { sal_Bool bConverted = sal_False; - // here we have to try to convert + // here we have to try to convert return bConverted; } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index dcc141fc9bd2..044c473ee1a4 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.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 { namespace kab { - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable> KabCommonStatement_BASE; @@ -52,20 +52,20 @@ namespace connectivity // Class KabCommonStatement // is a base class for the normal statement and for the prepared statement //************************************************************** - class KabCommonStatement : public comphelper::OBaseMutex, - public KabCommonStatement_BASE, - public ::cppu::OPropertySetHelper, - public comphelper::OPropertyArrayUsageHelper<KabCommonStatement> + class KabCommonStatement : public comphelper::OBaseMutex, + public KabCommonStatement_BASE, + public ::cppu::OPropertySetHelper, + public comphelper::OPropertyArrayUsageHelper<KabCommonStatement> { - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; + ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< ::rtl::OUString> m_aBatchList; - connectivity::OSQLParser m_aParser; - connectivity::OSQLParseTreeIterator m_aSQLIterator; - connectivity::OSQLParseNode* m_pParseTree; - KabConnection* m_pConnection; // The owning Connection object + ::std::list< ::rtl::OUString> m_aBatchList; + connectivity::OSQLParser m_aParser; + connectivity::OSQLParseTreeIterator m_aSQLIterator; + connectivity::OSQLParseNode* m_pParseTree; + KabConnection* m_pConnection; // The owning Connection object protected: class KabCondition *analyseWhereClause( diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx index f0af9c6c41c5..20247273a535 100644 --- a/connectivity/source/drivers/kab/KTable.cxx +++ b/connectivity/source/drivers/kab/KTable.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 @@ -45,7 +45,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -KabTable::KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection) +KabTable::KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection) : KabTable_TYPEDEF(_pTables, sal_True), m_pConnection(_pConnection) { diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx index 9ab4fb532143..2b640e4cdbfa 100644 --- a/connectivity/source/drivers/kab/KTable.hxx +++ b/connectivity/source/drivers/kab/KTable.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,8 +46,8 @@ namespace connectivity KabConnection* m_pConnection; public: - KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection); - KabTable( sdbcx::OCollection* _pTables, + KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection); + KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 55f10203b226..31d66547bd24 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.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/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx index d2d8179c09cf..438458c8e37c 100644 --- a/connectivity/source/drivers/kab/KTables.hxx +++ b/connectivity/source/drivers/kab/KTables.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/source/drivers/kab/kab.xcu b/connectivity/source/drivers/kab/kab.xcu index d350014a3017..0cc515e4ee40 100755 --- a/connectivity/source/drivers/kab/kab.xcu +++ b/connectivity/source/drivers/kab/kab.xcu @@ -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/source/drivers/kab/kab.xml b/connectivity/source/drivers/kab/kab.xml index 943906d6c3e7..115b9f5522d2 100644 --- a/connectivity/source/drivers/kab/kab.xml +++ b/connectivity/source/drivers/kab/kab.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding="UTF-8"?> <!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> kab1 </module-name> + <module-name> kab1 </module-name> <component-description> <Author>Eric Bischoff</Author> <Name>com.sun.star.comp.sdbc.kab.Driver</Name> @@ -10,68 +10,68 @@ <language>c++</language> <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> - <service-dependency> ... </service-dependency> - </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> + <service-dependency> ... </service-dependency> + </component-description> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu1 </runtime-module-dependency> - <runtime-module-dependency> sal1 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu1 </runtime-module-dependency> + <runtime-module-dependency> sal1 </runtime-module-dependency> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.util.XCancellable </type> - <type> com.sun.star.util.XNumberFormatter </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.beans.PropertyAttribute </type> - <type> com.sun.star.beans.XPropertyState </type> - <type> com.sun.star.beans.XPropertySet </type> - <type> com.sun.star.beans.PropertyValue </type> - <type> com.sun.star.beans.XMultiPropertySet </type> - <type> com.sun.star.beans.XFastPropertySet </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.lang.EventObject </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.lang.DisposedException </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XUnoTunnel </type> - <type> com.sun.star.java.XJavaThreadRegister_11 </type> - <type> com.sun.star.java.XJavaVM </type> - <type> com.sun.star.sdbc.FetchDirection </type> - <type> com.sun.star.sdbc.XConnection </type> - <type> com.sun.star.sdbc.XStatement </type> - <type> com.sun.star.sdbc.XResultSet </type> - <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> - <type> com.sun.star.sdbc.XColumnLocate </type> - <type> com.sun.star.sdbc.XResultSetUpdate </type> - <type> com.sun.star.sdbc.XWarningsSupplier </type> - <type> com.sun.star.sdbc.XRowUpdate </type> - <type> com.sun.star.sdbc.XMultipleResults </type> - <type> com.sun.star.sdbc.XBatchExecution </type> - <type> com.sun.star.sdbc.XPreparedBatchExecution </type> - <type> com.sun.star.sdbc.XParameters </type> - <type> com.sun.star.sdbc.XOutParameters </type> - <type> com.sun.star.sdbc.DriverPropertyInfo </type> - <type> com.sun.star.sdbc.SQLWarning </type> - <type> com.sun.star.sdbc.XRow </type> - <type> com.sun.star.sdbc.ColumnSearch </type> - <type> com.sun.star.sdbc.ColumnValue </type> - <type> com.sun.star.sdbc.DataType </type> - <type> com.sun.star.sdbc.XDriver </type> - <type> com.sun.star.sdbc.TransactionIsolation </type> - <type> com.sun.star.sdbc.ResultSetType </type> - <type> com.sun.star.sdbc.ResultSetConcurrency </type> - <type> com.sun.star.sdbcx.XRowLocate </type> - <type> com.sun.star.sdbcx.XDeleteRows </type> - <type> com.sun.star.sdbcx.CompareBookmark </type> - <type> com.sun.star.sdb.XColumnUpdate </type> - <type> com.sun.star.sdb.XColumn </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.util.XCancellable </type> + <type> com.sun.star.util.XNumberFormatter </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.beans.PropertyAttribute </type> + <type> com.sun.star.beans.XPropertyState </type> + <type> com.sun.star.beans.XPropertySet </type> + <type> com.sun.star.beans.PropertyValue </type> + <type> com.sun.star.beans.XMultiPropertySet </type> + <type> com.sun.star.beans.XFastPropertySet </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.lang.EventObject </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.lang.DisposedException </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XUnoTunnel </type> + <type> com.sun.star.java.XJavaThreadRegister_11 </type> + <type> com.sun.star.java.XJavaVM </type> + <type> com.sun.star.sdbc.FetchDirection </type> + <type> com.sun.star.sdbc.XConnection </type> + <type> com.sun.star.sdbc.XStatement </type> + <type> com.sun.star.sdbc.XResultSet </type> + <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> + <type> com.sun.star.sdbc.XColumnLocate </type> + <type> com.sun.star.sdbc.XResultSetUpdate </type> + <type> com.sun.star.sdbc.XWarningsSupplier </type> + <type> com.sun.star.sdbc.XRowUpdate </type> + <type> com.sun.star.sdbc.XMultipleResults </type> + <type> com.sun.star.sdbc.XBatchExecution </type> + <type> com.sun.star.sdbc.XPreparedBatchExecution </type> + <type> com.sun.star.sdbc.XParameters </type> + <type> com.sun.star.sdbc.XOutParameters </type> + <type> com.sun.star.sdbc.DriverPropertyInfo </type> + <type> com.sun.star.sdbc.SQLWarning </type> + <type> com.sun.star.sdbc.XRow </type> + <type> com.sun.star.sdbc.ColumnSearch </type> + <type> com.sun.star.sdbc.ColumnValue </type> + <type> com.sun.star.sdbc.DataType </type> + <type> com.sun.star.sdbc.XDriver </type> + <type> com.sun.star.sdbc.TransactionIsolation </type> + <type> com.sun.star.sdbc.ResultSetType </type> + <type> com.sun.star.sdbc.ResultSetConcurrency </type> + <type> com.sun.star.sdbcx.XRowLocate </type> + <type> com.sun.star.sdbcx.XDeleteRows </type> + <type> com.sun.star.sdbcx.CompareBookmark </type> + <type> com.sun.star.sdb.XColumnUpdate </type> + <type> com.sun.star.sdb.XColumn </type> </module-description> diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx index 6e44372924e5..2ecdead169f5 100644 --- a/connectivity/source/drivers/kab/kcondition.cxx +++ b/connectivity/source/drivers/kab/kcondition.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 @@ -123,7 +123,7 @@ sal_Bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber); // Timestamps should not be compared according to their string value // The syntax for such queries should be like -// {ts '2004-03-29 12:55:00.000000'} +// {ts '2004-03-29 12:55:00.000000'} // They should also support operators like '<' or '>=' if (aQtName.isNull()) return sal_False; diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index 34e014c637d6..41873bd420a7 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.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/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx index 9acae2750e64..cf1632b3cdef 100644 --- a/connectivity/source/drivers/kab/kfields.cxx +++ b/connectivity/source/drivers/kab/kfields.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 @@ -69,7 +69,7 @@ sal_uInt32 findKabField(const ::rtl::OUString& columnName) throw(SQLException) ::KABC::Field::List::iterator aField; sal_uInt32 nResult; - for ( aField = aFields.begin(), nResult = KAB_DATA_FIELDS; + for ( aField = aFields.begin(), nResult = KAB_DATA_FIELDS; aField != aFields.end(); ++aField, ++nResult) { diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx index 6a79455f906c..2e628cd41363 100644 --- a/connectivity/source/drivers/kab/kfields.hxx +++ b/connectivity/source/drivers/kab/kfields.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 @@ -33,8 +33,8 @@ #include <connectivity/dbexception.hxx> #include <rtl/ustring.hxx> -#define KAB_FIELD_REVISION 0 -#define KAB_DATA_FIELDS 1 +#define KAB_FIELD_REVISION 0 +#define KAB_DATA_FIELDS 1 namespace connectivity { diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx index 6220a2383133..e10d2cfeee38 100644 --- a/connectivity/source/drivers/kab/korder.cxx +++ b/connectivity/source/drivers/kab/korder.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/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx index 29fa9637c396..d6df56d3835e 100644 --- a/connectivity/source/drivers/kab/korder.hxx +++ b/connectivity/source/drivers/kab/korder.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/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx index 346336ae6be8..97469643cf7a 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.cxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.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 @@ -51,7 +51,7 @@ MacabAddressBook::MacabAddressBook( ) m_xMacabRecords = NULL; m_bRetrievedGroups = sal_False; } - + // ----------------------------------------------------------------------------- MacabAddressBook::~MacabAddressBook() { @@ -72,7 +72,7 @@ MacabAddressBook::~MacabAddressBook() m_bRetrievedGroups = sal_False; } - + // ----------------------------------------------------------------------------- /* Get the address book's default table name. This is the table name that * refers to the table containing _all_ records in the address book. diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx index 7ac3f4593d3f..2aefbd8d9ec7 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.hxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.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,7 +66,7 @@ namespace connectivity MacabGroup *getMacabGroupMatch(::rtl::OUString _groupName); MacabRecords *getMacabRecordsMatch(const ::rtl::OUString _tableName); }; - + } } diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 2e836e1390b9..bd9342b4bd56 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.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 @@ -105,7 +105,7 @@ Reference< XNameAccess > SAL_CALL MacabCatalog::getTables( ) throw(RuntimeExcep { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - + try { if (!m_pTables) diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index c63f4187791a..52e4e7782f89 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.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 class MacabCatalog : public connectivity::sdbcx::OCatalog { - MacabConnection* m_pConnection; // used to get the metadata + MacabConnection* m_pConnection; // used to get the metadata ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index 8501aadd2a70..0d78b459692f 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.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 @@ -90,7 +90,7 @@ void MacabColumns::impl_refresh() throw(RuntimeException) m_pTable->refreshColumns(); } // ------------------------------------------------------------------------- -MacabColumns::MacabColumns( MacabTable* _pTable, +MacabColumns::MacabColumns( MacabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(*_pTable, sal_True, _rMutex, _rVector), diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index 3cc87d4bedc8..1d75c8b58515 100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.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,13 +39,13 @@ namespace connectivity class MacabColumns : public sdbcx::OCollection { protected: - MacabTable* m_pTable; + MacabTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - MacabColumns( MacabTable* _pTable, + MacabColumns( MacabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector); }; diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx index bb9052b463f0..4841430a0721 100644 --- a/connectivity/source/drivers/macab/MacabConnection.cxx +++ b/connectivity/source/drivers/macab/MacabConnection.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 @@ -48,7 +48,7 @@ using namespace com::sun::star::sdbcx; IMPLEMENT_SERVICE_INFO(MacabConnection, "com.sun.star.sdbc.drivers.MacabConnection", "com.sun.star.sdbc.Connection") //----------------------------------------------------------------------------- -MacabConnection::MacabConnection(MacabDriver* _pDriver) +MacabConnection::MacabConnection(MacabDriver* _pDriver) : OSubComponent<MacabConnection, MacabConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_pAddressBook(NULL), m_pDriver(_pDriver) diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index f149847958b9..65ece28448a5 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.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 class MacabDatabaseMetaData; class MacabAddressBook; - //typedef OMetaConnection_BASE MacabConnection_BASE; // implements basics and text encoding + //typedef OMetaConnection_BASE MacabConnection_BASE; // implements basics and text encoding typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; typedef connectivity::OMetaConnection MacabConnection_BASE; @@ -70,10 +70,10 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - MacabAddressBook* m_pAddressBook; // the address book - MacabDriver* m_pDriver; // pointer to the owning driver object + MacabAddressBook* m_pAddressBook; // the address book + MacabDriver* m_pDriver; // pointer to the owning driver object ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> - m_xCatalog; // needed for the SQL interpreter + m_xCatalog; // needed for the SQL interpreter public: virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); @@ -123,8 +123,8 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); // accessors - inline MacabDriver* getDriver() const { return m_pDriver;} - MacabAddressBook* getAddressBook() const; + inline MacabDriver* getDriver() const { return m_pDriver;} + MacabAddressBook* getAddressBook() const; }; } } diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index a7217c6bd666..3392d0f208e5 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.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 @@ -50,14 +50,14 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -MacabDatabaseMetaData::MacabDatabaseMetaData(MacabConnection* _pCon) +MacabDatabaseMetaData::MacabDatabaseMetaData(MacabConnection* _pCon) : m_xConnection(_pCon), m_bUseCatalog(sal_True) { OSL_ENSURE(_pCon,"MacabDatabaseMetaData::MacabDatabaseMetaData: No connection set!"); osl_incrementInterlockedCount( &m_refCount ); - m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); + m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); osl_decrementInterlockedCount( &m_refCount ); } // ------------------------------------------------------------------------- @@ -868,17 +868,17 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas( ) throw(SQL return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( const Any&, const ::rtl::OUString&, - const ::rtl::OUString& tableNamePattern, + const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); @@ -916,7 +916,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( MacabHeader::iterator aField; - for ( aField = aHeader->begin(); + for ( aField = aHeader->begin(); aField != aHeader->end(); ++aField, ++nPosition) { @@ -962,7 +962,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, @@ -1005,7 +1005,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( ::std::vector<MacabGroup *> xGroups = m_xConnection->getAddressBook()->getMacabGroups(); sal_Int32 i, nGroups; nGroups = xGroups.size(); - + aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[1] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[2] = ODatabaseMetaDataResultSet::getEmptyValue(); @@ -1024,21 +1024,21 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns( - const Any&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures( - const Any&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures( + const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( const Any&, const ::rtl::OUString&, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns ); @@ -1071,47 +1071,47 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getIndexInfo( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getIndexInfo( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getBestRowIdentifier( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getBestRowIdentifier( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const Any&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference( + const Any&, const ::rtl::OUString&, + const ::rtl::OUString&, const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 0cc796bda9be..852cd32c7db0 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.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 @@ -45,8 +45,8 @@ namespace connectivity class MacabDatabaseMetaData : public MacabDatabaseMetaData_BASE { - ::com::sun::star::uno::Reference< MacabConnection > m_xConnection; - sal_Bool m_bUseCatalog; + ::com::sun::star::uno::Reference< MacabConnection > m_xConnection; + sal_Bool m_bUseCatalog; public: diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 796b814710db..abcfe98bd0a0 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.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/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index 2648e3871e82..c21715ec09fb 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.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,9 +38,9 @@ #include <osl/module.h> // the address book driver's version -#define MACAB_DRIVER_VERSION "0.1" -#define MACAB_DRIVER_VERSION_MAJOR 0 -#define MACAB_DRIVER_VERSION_MINOR 1 +#define MACAB_DRIVER_VERSION "0.1" +#define MACAB_DRIVER_VERSION_MAJOR 0 +#define MACAB_DRIVER_VERSION_MINOR 1 namespace connectivity { @@ -131,11 +131,11 @@ namespace connectivity class MacabDriver : public MacabDriver_BASE { protected: - ::osl::Mutex m_aMutex; // mutex is need to control member access - OWeakRefArray m_xConnections; // vector containing a list of all the + ::osl::Mutex m_aMutex; // mutex is need to control member access + OWeakRefArray m_xConnections; // vector containing a list of all the // MacabConnection objects for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xMSFactory; // the multi-service factory + m_xMSFactory; // the multi-service factory MacabImplModule m_aImplModule; public: diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx index f254e2d48f82..6f0dabf45b0f 100644 --- a/connectivity/source/drivers/macab/MacabGroup.cxx +++ b/connectivity/source/drivers/macab/MacabGroup.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/source/drivers/macab/MacabGroup.hxx b/connectivity/source/drivers/macab/MacabGroup.hxx index afc45408face..1f09ac0d09ad 100644 --- a/connectivity/source/drivers/macab/MacabGroup.hxx +++ b/connectivity/source/drivers/macab/MacabGroup.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/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx index c8b28853feff..11519522d683 100644 --- a/connectivity/source/drivers/macab/MacabHeader.cxx +++ b/connectivity/source/drivers/macab/MacabHeader.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 @@ -66,7 +66,7 @@ MacabHeader::MacabHeader(const sal_Int32 _size, macabfield **_fields) CFRetain(fields[i]->value); } } - + } // ------------------------------------------------------------------------- @@ -124,7 +124,7 @@ void MacabHeader::operator+= (const MacabHeader *r) numToAdd++; } } - + newFields = new macabfield *[size+numToAdd]; for(i = 0; i < size; i++) { @@ -249,7 +249,7 @@ macabfield **MacabHeader::sortRecord(const sal_Int32 _start, const sal_Int32 _le return sorted; } -sal_Int32 MacabHeader::compareFields(const macabfield *_field1, const macabfield *_field2) +sal_Int32 MacabHeader::compareFields(const macabfield *_field1, const macabfield *_field2) { /* Comparing two fields in a MacabHeader is different than comparing two * fields in a MacabRecord. It starts in the same way (if one of the two diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx index 05c381928ce4..b0dc2820e6cb 100644 --- a/connectivity/source/drivers/macab/MacabHeader.hxx +++ b/connectivity/source/drivers/macab/MacabHeader.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/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index aa94353e72cd..19d9c5f9de9e 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.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 @@ -59,7 +59,7 @@ void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(S // ------------------------------------------------------------------------- void MacabPreparedStatement::setMacabFields() const throw(SQLException) { - ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns + ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns xColumns = m_aSQLIterator.getSelectColumns(); if (!xColumns.is()) @@ -150,7 +150,7 @@ void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeExcepti { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - + // Reset last warning message try { clearWarnings (); @@ -178,7 +178,7 @@ sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, R { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - + // same as in statement with the difference that this statement also can contain parameter return 0; } @@ -213,64 +213,64 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3 // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setObjectNull", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBoolean", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setByte", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setShort", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setInt", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setLong", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setFloat", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } @@ -287,48 +287,48 @@ void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBytes", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setDate", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setTime", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setTimestamp", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBinaryStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setCharacterStream", NULL); } @@ -347,40 +347,40 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setObjectWithInfo", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setRef", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBlob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setClob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setArray", NULL); } diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx index 15443ef7636c..0fb1b6e92d91 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.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,7 +42,7 @@ namespace connectivity { class OBoundParam; - typedef ::cppu::ImplInheritanceHelper4< MacabCommonStatement, + typedef ::cppu::ImplInheritanceHelper4< MacabCommonStatement, ::com::sun::star::sdbc::XPreparedStatement, ::com::sun::star::sdbc::XParameters, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, @@ -51,12 +51,12 @@ namespace connectivity class MacabPreparedStatement : public MacabPreparedStatement_BASE { protected: - ::rtl::OUString m_sSqlStatement; + ::rtl::OUString m_sSqlStatement; ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; - sal_Bool m_bPrepared; - mutable sal_Int32 m_nParameterIndex; - OValueRow m_aParameterRow; + sal_Bool m_bPrepared; + mutable sal_Int32 m_nParameterIndex; + OValueRow m_aParameterRow; void checkAndResizeParameters(sal_Int32 nParams) throw(::com::sun::star::sdbc::SQLException); void setMacabFields() const throw(::com::sun::star::sdbc::SQLException); diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx index d3521663e9e1..bb6eb60661f0 100644 --- a/connectivity/source/drivers/macab/MacabRecord.cxx +++ b/connectivity/source/drivers/macab/MacabRecord.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 @@ -173,9 +173,9 @@ void MacabRecord::releaseFields() } // ------------------------------------------------------------------------- -sal_Int32 MacabRecord::compareFields(const macabfield *_field1, const macabfield *_field2) +sal_Int32 MacabRecord::compareFields(const macabfield *_field1, const macabfield *_field2) { - + /* When comparing records, if either field is NULL (and the other is * not), that field is considered "greater than" the other, so that it * shows up later in the list when fields are ordered. @@ -247,7 +247,7 @@ macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, case kABDateProperty: { DateTime aDateTime = DBTypeConversion::toDateTime(_newFieldString); - + // bad format... if(aDateTime.Year == 0 && aDateTime.Month == 0 && aDateTime.Day == 0) { diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx index 9ab992eeb27a..aa47f8377bba 100644 --- a/connectivity/source/drivers/macab/MacabRecord.hxx +++ b/connectivity/source/drivers/macab/MacabRecord.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/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index 02c3a90cf511..601808e9a7bf 100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.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 @@ -152,7 +152,7 @@ void MacabRecords::initialize() records[i] = createMacabRecord(record, header, recordType); } currentRecord = recordsSize; - + CFRelease(allRecords); } @@ -204,7 +204,7 @@ MacabRecord *MacabRecords::insertRecord(MacabRecord *_newRecord, const sal_Int32 */ if(_location >= currentRecord) currentRecord = _location+1; - + oldRecord = records[_location]; records[_location] = _newRecord; return oldRecord; @@ -352,7 +352,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, CFArrayRef allProperties = ABCopyArrayOfPropertiesForRecordType(addressBook, _recordType); CFStringRef *nonRequiredProperties; sal_Int32 numRecords = (sal_Int32) CFArrayGetCount(_records); - sal_Int32 numProperties = (sal_Int32) CFArrayGetCount(allProperties); + sal_Int32 numProperties = (sal_Int32) CFArrayGetCount(allProperties); sal_Int32 numNonRequiredProperties = numProperties - numRequiredProperties; /* While searching through the properties for required properties, these @@ -546,7 +546,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert if(_propertyValue != NULL) { sal_Int32 i; - + sal_Int32 multiLength = ABMultiValueCount((ABMutableMultiValueRef) _propertyValue); CFStringRef multiLabel, localizedMultiLabel; ::rtl::OUString multiLabelString; @@ -651,7 +651,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert j++; k = 0; } - + headerNames[i] = multiHeaders[j]->copy(k); } for(i = 0; i < multiLengthFirstLevel; i++) @@ -660,7 +660,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert delete [] multiHeaders; } break; - + /* Dictionary */ case kABDictionaryProperty: /* For non-scalars, we can only get more information if the property @@ -729,7 +729,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert j++; k = 0; } - + headerNames[i] = dictHeaders[j]->copy(k); } @@ -789,7 +789,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert j++; k = 0; } - + headerNames[i] = arrHeaders[j]->copy(k); } for(i = 0; i < arrLength; i++) @@ -869,7 +869,7 @@ MacabRecord *MacabRecords::createMacabRecord(const ABRecordRef _abrecord, const MacabRecord *macabRecord = new MacabRecord(_header->getSize()); CFArrayRef recordProperties = ABCopyArrayOfPropertiesForRecordType(addressBook, _recordType); - sal_Int32 numProperties = (sal_Int32) CFArrayGetCount(recordProperties); + sal_Int32 numProperties = (sal_Int32) CFArrayGetCount(recordProperties); sal_Int32 i; @@ -955,7 +955,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT sal_Bool bPlaced = sal_False; ::rtl::OUString columnName = ::rtl::OUString(_propertyName); sal_Int32 i = 1; - + // A big safeguard to prevent two fields from having the same name. while(bPlaced != sal_True) { diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx index 80c87ee7d40a..dfd6cb8429f7 100644 --- a/connectivity/source/drivers/macab/MacabRecords.hxx +++ b/connectivity/source/drivers/macab/MacabRecords.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 @@ -71,7 +71,7 @@ namespace connectivity /* For required properties */ CFStringRef *requiredProperties; sal_Int32 numRequiredProperties; - + private: /* All of the private methods are for creating a MacabHeader or a * MacabRecord. They are used by the initialize method that goes diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index 242e92f3cc13..314337fbe73a 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.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 @@ -56,7 +56,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(MacabResultSet, "com.sun.star.sdbc.drivers.MacabResultSet", "com.sun.star.sdbc.ResultSet"); // ------------------------------------------------------------------------- -MacabResultSet::MacabResultSet(MacabCommonStatement* pStmt) +MacabResultSet::MacabResultSet(MacabCommonStatement* pStmt) : MacabResultSet_BASE(m_aMutex), OPropertySetHelper(MacabResultSet_BASE::rBHelper), m_xStatement(pStmt), @@ -75,7 +75,7 @@ MacabResultSet::~MacabResultSet() void MacabResultSet::allMacabRecords() { MacabConnection* pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get()); - + m_aMacabRecords = pConnection->getAddressBook()->getMacabRecords(m_sTableName); } // ------------------------------------------------------------------------- @@ -83,7 +83,7 @@ void MacabResultSet::someMacabRecords(const MacabCondition *pCondition) { MacabConnection* pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get()); MacabRecords* allRecords; - + allRecords = pConnection->getAddressBook()->getMacabRecords(m_sTableName); // Bad table!! Throw exception? @@ -191,13 +191,13 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const ::rtl::OUString& columnName) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - // find the first column with the name columnName + // find the first column with the name columnName Reference< XResultSetMetaData > xMeta = getMetaData(); sal_Int32 nLen = xMeta->getColumnCount(); for (sal_Int32 i = 1; i <= nLen; ++i) if (xMeta->isCaseSensitive(i) ? - columnName == xMeta->getColumnName(i) : + columnName == xMeta->getColumnName(i) : columnName.equalsIgnoreAsciiCase(xMeta->getColumnName(i))) return i; @@ -578,7 +578,7 @@ void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - + // move before the first row m_nRowPos = -1; } @@ -692,7 +692,7 @@ sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeExcept } // ------------------------------------------------------------------------- sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeException) -{ +{ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -742,7 +742,7 @@ void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - + // only when you allow updates } // ------------------------------------------------------------------------- @@ -762,7 +762,7 @@ void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcep { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - + // only when you allow inserts } // ------------------------------------------------------------------------- @@ -985,7 +985,7 @@ Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const Sequence< Any { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - + return Sequence< sal_Int32 >(); } // ------------------------------------------------------------------------- @@ -994,12 +994,12 @@ IPropertyArrayHelper* MacabResultSet::createArrayHelper() const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); - DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); + DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); } diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 46363e979469..029aa6c13ad0 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.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 @@ -45,7 +45,7 @@ namespace connectivity namespace macab { /* - ** MacabResultSet + ** MacabResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -61,18 +61,18 @@ namespace connectivity ::com::sun::star::lang::XServiceInfo> MacabResultSet_BASE; class MacabRecords; - class MacabResultSet : public comphelper::OBaseMutex, - public MacabResultSet_BASE, - public ::cppu::OPropertySetHelper, - public comphelper::OPropertyArrayUsageHelper<MacabResultSet> + class MacabResultSet : public comphelper::OBaseMutex, + public MacabResultSet_BASE, + public ::cppu::OPropertySetHelper, + public comphelper::OPropertyArrayUsageHelper<MacabResultSet> { protected: - ::rtl::Reference< MacabCommonStatement > m_xStatement; // the statement that has created this result set - ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; // the description of the columns in this result set - MacabRecords * m_aMacabRecords; // address book entries matching the query - sal_Int32 m_nRowPos; // the current row within the result set - sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL - ::rtl::OUString m_sTableName; + ::rtl::Reference< MacabCommonStatement > m_xStatement; // the statement that has created this result set + ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; // the description of the columns in this result set + MacabRecords * m_aMacabRecords; // address book entries matching the query + sal_Int32 m_nRowPos; // the current row within the result set + sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL + ::rtl::OUString m_sTableName; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; @@ -99,7 +99,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - + MacabResultSet(MacabCommonStatement *pStmt); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 21cd4e9727c5..27ff55dcedb3 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.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 @@ -58,7 +58,7 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity: static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name")); MacabRecords *aRecords; MacabHeader *aHeader; - + aRecords = m_pConnection->getAddressBook()->getMacabRecords(m_sTableName); // In case, somehow, we don't have anything with the name m_sTableName @@ -78,7 +78,7 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity: nFieldNumber = aHeader->getColumnNumber(aFieldName); m_aMacabFields.push_back(nFieldNumber); } - + } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 column) throw(SQLException, RuntimeException) @@ -92,7 +92,7 @@ sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column) throw MacabRecords *aRecords; MacabHeader *aHeader; macabfield *aField; - + aRecords = m_pConnection->getAddressBook()->getMacabRecords(m_sTableName); // In case, somehow, we don't have anything with the name m_sTableName @@ -133,7 +133,7 @@ sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLEx sal_uInt32 nFieldNumber = m_aMacabFields[column - 1]; MacabRecords *aRecords; MacabHeader *aHeader; - + aRecords = m_pConnection->getAddressBook()->getMacabRecords(m_sTableName); // In case, somehow, we don't have anything with the name m_sTableName diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index ab5b9bd20062..2140a03b3073 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.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 @@ -41,15 +41,15 @@ namespace connectivity namespace macab { /* - ** MacabResultSetMetaData + ** MacabResultSetMetaData */ typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> MacabResultSetMetaData_BASE; class MacabResultSetMetaData : public MacabResultSetMetaData_BASE { - MacabConnection* m_pConnection; - ::rtl::OUString m_sTableName; - ::std::vector<sal_Int32> m_aMacabFields; // for each selected column, contains the number + MacabConnection* m_pConnection; + ::rtl::OUString m_sTableName; + ::std::vector<sal_Int32> m_aMacabFields; // for each selected column, contains the number // of the corresponding AddressBook field protected: diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index cc3535ec5586..d6e9e7b385a2 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.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 @@ -116,8 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 583dc62910b6..fa2654131fa2 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.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 @@ -73,7 +73,7 @@ namespace connectivity IMPLEMENT_SERVICE_INFO(MacabStatement, "com.sun.star.sdbc.drivers.MacabStatement", "com.sun.star.sdbc.Statement"); //------------------------------------------------------------------------------ -MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection ) +MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection ) : MacabCommonStatement_BASE(m_aMutex), OPropertySetHelper(MacabCommonStatement_BASE::rBHelper), m_aParser(_pConnection->getDriver()->getMSFactory()), @@ -147,9 +147,9 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP { ::rtl::OUString sMatchString; - if (pRight->isToken()) // WHERE Name = 'Doe' + if (pRight->isToken()) // WHERE Name = 'Doe' sMatchString = pRight->getTokenValue(); - else if (SQL_ISRULE(pRight, parameter)) // WHERE Name = ? + else if (SQL_ISRULE(pRight, parameter)) // WHERE Name = ? getNextParameter(sMatchString); switch (pMiddle->getNodeType()) @@ -192,7 +192,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP else if (SQL_ISRULE(pParseNode, test_for_null) || SQL_ISRULE(pParseNode, like_predicate)) { const OSQLParseNode *pLeft = pParseNode->getChild(0); - const OSQLParseNode* pPart2 = pParseNode->getChild(1); + const OSQLParseNode* pPart2 = pParseNode->getChild(1); const OSQLParseNode *pMiddleLeft = pPart2->getChild(0), *pMiddleRight = pPart2->getChild(1), *pRight = pPart2->getChild(2); @@ -233,9 +233,9 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP { ::rtl::OUString sMatchString; - if (pMiddleRight->isToken()) // WHERE Name LIKE 'Sm%' + if (pMiddleRight->isToken()) // WHERE Name LIKE 'Sm%' sMatchString = pMiddleRight->getTokenValue(); - else if (SQL_ISRULE(pMiddleRight, parameter)) // WHERE Name LIKE ? + else if (SQL_ISRULE(pMiddleRight, parameter)) // WHERE Name LIKE ? getNextParameter(sMatchString); return new MacabConditionSimilar(m_pHeader, sColumnName, sMatchString); @@ -313,8 +313,8 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar //------------------------------------------------------------------------------ void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(SQLException) { - ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns - MacabResultSetMetaData *pMeta; // meta information - holds the list of AddressBook fields + ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns + MacabResultSetMetaData *pMeta; // meta information - holds the list of AddressBook fields xColumns = m_aSQLIterator.getSelectColumns(); if (!xColumns.is()) @@ -385,7 +385,7 @@ Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(Ru // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL MacabCommonStatement::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); @@ -405,7 +405,7 @@ void SAL_CALL MacabCommonStatement::close( ) throw(SQLException, RuntimeExcepti { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - + } dispose(); } @@ -460,20 +460,20 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql)); pResult->setTableName(sTableName); - setMacabFields(pResult); // SELECT which columns ? - selectRecords(pResult); // WHERE which condition ? - sortRecords(pResult); // ORDER BY which columns ? + setMacabFields(pResult); // SELECT which columns ? + selectRecords(pResult); // WHERE which condition ? + sortRecords(pResult); // ORDER BY which columns ? } // To be continued: DISTINCT -// etc... +// etc... } } break; default: // To be continued: UPDATE -// DELETE -// etc... +// DELETE +// etc... impl_throwError(STR_QUERY_TOO_COMPLEX); } @@ -485,7 +485,7 @@ Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) throw( { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - + // just return our connection here return (Reference< XConnection >) m_pConnection; } @@ -494,8 +494,8 @@ sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const ::rtl::OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - - // the return values gives information about how many rows are affected by executing the sql statement + + // the return values gives information about how many rows are affected by executing the sql statement return 0; } // ------------------------------------------------------------------------- @@ -522,12 +522,12 @@ void SAL_CALL MacabCommonStatement::clearWarnings( ) throw(SQLException, Runtim Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -548,7 +548,7 @@ sal_Bool MacabCommonStatement::convertFastPropertyValue( const Any&) throw (::com::sun::star::lang::IllegalArgumentException) { sal_Bool bConverted = sal_False; - // here we have to try to convert + // here we have to try to convert return bConverted; } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index e9fabc4ee9dc..0eda7b05f5b9 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.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 { namespace macab { - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable> MacabCommonStatement_BASE; @@ -53,23 +53,23 @@ namespace connectivity // Class MacabCommonStatement // is a base class for the normal statement and for the prepared statement //************************************************************** - class MacabCommonStatement : public comphelper::OBaseMutex, - public MacabCommonStatement_BASE, - public ::cppu::OPropertySetHelper, - public comphelper::OPropertyArrayUsageHelper<MacabCommonStatement> + class MacabCommonStatement : public comphelper::OBaseMutex, + public MacabCommonStatement_BASE, + public ::cppu::OPropertySetHelper, + public comphelper::OPropertyArrayUsageHelper<MacabCommonStatement> { - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; + ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< ::rtl::OUString> m_aBatchList; - connectivity::OSQLParser m_aParser; - connectivity::OSQLParseTreeIterator m_aSQLIterator; - connectivity::OSQLParseNode* m_pParseTree; - MacabConnection* m_pConnection; // The owning Connection object - MacabHeader* m_pHeader; // The header of the address book on which to run queries (provided by m_pConnection) + ::std::list< ::rtl::OUString> m_aBatchList; + connectivity::OSQLParser m_aParser; + connectivity::OSQLParseTreeIterator m_aSQLIterator; + connectivity::OSQLParseNode* m_pParseTree; + MacabConnection* m_pConnection; // The owning Connection object + MacabHeader* m_pHeader; // The header of the address book on which to run queries (provided by m_pConnection) ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created - + protected: class MacabCondition *analyseWhereClause( diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index f6d78221d30d..ab4ff29d6578 100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.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 @@ -45,7 +45,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection) +MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection) : MacabTable_TYPEDEF(_pTables, sal_True), m_pConnection(_pConnection) { diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx index 1375aacc2e9a..39f113368e63 100644 --- a/connectivity/source/drivers/macab/MacabTable.hxx +++ b/connectivity/source/drivers/macab/MacabTable.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,8 +46,8 @@ namespace connectivity MacabConnection* m_pConnection; public: - MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection); - MacabTable( sdbcx::OCollection* _pTables, + MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection); + MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index eddd6a68ab7f..1d839f40f90b 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.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/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 657fa753d7d3..17422ce862a2 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.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/source/drivers/macab/macab.xcu b/connectivity/source/drivers/macab/macab.xcu index 0845bc9a2ce2..cbb9d0b6b0c0 100755 --- a/connectivity/source/drivers/macab/macab.xcu +++ b/connectivity/source/drivers/macab/macab.xcu @@ -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/source/drivers/macab/macab.xml b/connectivity/source/drivers/macab/macab.xml index b524d1b0bd50..e1c4b57c378b 100755 --- a/connectivity/source/drivers/macab/macab.xml +++ b/connectivity/source/drivers/macab/macab.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding="UTF-8"?> <!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> macab1 </module-name> + <module-name> macab1 </module-name> <component-description> <Author>Omer bar-or</Author> <Name>com.sun.star.comp.sdbc.macab.Driver</Name> @@ -10,68 +10,68 @@ <language>c++</language> <status value="alpha"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> - <service-dependency> ... </service-dependency> - </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> + <service-dependency> ... </service-dependency> + </component-description> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu1 </runtime-module-dependency> - <runtime-module-dependency> sal1 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu1 </runtime-module-dependency> + <runtime-module-dependency> sal1 </runtime-module-dependency> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.util.XCancellable </type> - <type> com.sun.star.util.XNumberFormatter </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.beans.PropertyAttribute </type> - <type> com.sun.star.beans.XPropertyState </type> - <type> com.sun.star.beans.XPropertySet </type> - <type> com.sun.star.beans.PropertyValue </type> - <type> com.sun.star.beans.XMultiPropertySet </type> - <type> com.sun.star.beans.XFastPropertySet </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.lang.EventObject </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.lang.DisposedException </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XUnoTunnel </type> - <type> com.sun.star.java.XJavaThreadRegister_11 </type> - <type> com.sun.star.java.XJavaVM </type> - <type> com.sun.star.sdbc.FetchDirection </type> - <type> com.sun.star.sdbc.XConnection </type> - <type> com.sun.star.sdbc.XStatement </type> - <type> com.sun.star.sdbc.XResultSet </type> - <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> - <type> com.sun.star.sdbc.XColumnLocate </type> - <type> com.sun.star.sdbc.XResultSetUpdate </type> - <type> com.sun.star.sdbc.XWarningsSupplier </type> - <type> com.sun.star.sdbc.XRowUpdate </type> - <type> com.sun.star.sdbc.XMultipleResults </type> - <type> com.sun.star.sdbc.XBatchExecution </type> - <type> com.sun.star.sdbc.XPreparedBatchExecution </type> - <type> com.sun.star.sdbc.XParameters </type> - <type> com.sun.star.sdbc.XOutParameters </type> - <type> com.sun.star.sdbc.DriverPropertyInfo </type> - <type> com.sun.star.sdbc.SQLWarning </type> - <type> com.sun.star.sdbc.XRow </type> - <type> com.sun.star.sdbc.ColumnSearch </type> - <type> com.sun.star.sdbc.ColumnValue </type> - <type> com.sun.star.sdbc.DataType </type> - <type> com.sun.star.sdbc.XDriver </type> - <type> com.sun.star.sdbc.TransactionIsolation </type> - <type> com.sun.star.sdbc.ResultSetType </type> - <type> com.sun.star.sdbc.ResultSetConcurrency </type> - <type> com.sun.star.sdbcx.XRowLocate </type> - <type> com.sun.star.sdbcx.XDeleteRows </type> - <type> com.sun.star.sdbcx.CompareBookmark </type> - <type> com.sun.star.sdb.XColumnUpdate </type> - <type> com.sun.star.sdb.XColumn </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.util.XCancellable </type> + <type> com.sun.star.util.XNumberFormatter </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.beans.PropertyAttribute </type> + <type> com.sun.star.beans.XPropertyState </type> + <type> com.sun.star.beans.XPropertySet </type> + <type> com.sun.star.beans.PropertyValue </type> + <type> com.sun.star.beans.XMultiPropertySet </type> + <type> com.sun.star.beans.XFastPropertySet </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.lang.EventObject </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.lang.DisposedException </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XUnoTunnel </type> + <type> com.sun.star.java.XJavaThreadRegister_11 </type> + <type> com.sun.star.java.XJavaVM </type> + <type> com.sun.star.sdbc.FetchDirection </type> + <type> com.sun.star.sdbc.XConnection </type> + <type> com.sun.star.sdbc.XStatement </type> + <type> com.sun.star.sdbc.XResultSet </type> + <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> + <type> com.sun.star.sdbc.XColumnLocate </type> + <type> com.sun.star.sdbc.XResultSetUpdate </type> + <type> com.sun.star.sdbc.XWarningsSupplier </type> + <type> com.sun.star.sdbc.XRowUpdate </type> + <type> com.sun.star.sdbc.XMultipleResults </type> + <type> com.sun.star.sdbc.XBatchExecution </type> + <type> com.sun.star.sdbc.XPreparedBatchExecution </type> + <type> com.sun.star.sdbc.XParameters </type> + <type> com.sun.star.sdbc.XOutParameters </type> + <type> com.sun.star.sdbc.DriverPropertyInfo </type> + <type> com.sun.star.sdbc.SQLWarning </type> + <type> com.sun.star.sdbc.XRow </type> + <type> com.sun.star.sdbc.ColumnSearch </type> + <type> com.sun.star.sdbc.ColumnValue </type> + <type> com.sun.star.sdbc.DataType </type> + <type> com.sun.star.sdbc.XDriver </type> + <type> com.sun.star.sdbc.TransactionIsolation </type> + <type> com.sun.star.sdbc.ResultSetType </type> + <type> com.sun.star.sdbc.ResultSetConcurrency </type> + <type> com.sun.star.sdbcx.XRowLocate </type> + <type> com.sun.star.sdbcx.XDeleteRows </type> + <type> com.sun.star.sdbcx.CompareBookmark </type> + <type> com.sun.star.sdb.XColumnUpdate </type> + <type> com.sun.star.sdb.XColumn </type> </module-description> diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx index 9c584cb96803..3faf0aa26137 100644 --- a/connectivity/source/drivers/macab/macabcondition.cxx +++ b/connectivity/source/drivers/macab/macabcondition.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/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index d268c4100bdb..29f27bc52ff6 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.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/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx index c1afc29d7867..fa8ba7a1abfb 100644 --- a/connectivity/source/drivers/macab/macaborder.cxx +++ b/connectivity/source/drivers/macab/macaborder.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/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx index 2dbc6c5d2850..bad4bc813306 100644 --- a/connectivity/source/drivers/macab/macaborder.hxx +++ b/connectivity/source/drivers/macab/macaborder.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/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx index 2f128ed000a0..9b9aa1f6443d 100644 --- a/connectivity/source/drivers/macab/macabutilities.hxx +++ b/connectivity/source/drivers/macab/macabutilities.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/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx index 45e399473eee..4cf749277227 100644 --- a/connectivity/source/drivers/mozab/MCatalog.cxx +++ b/connectivity/source/drivers/mozab/MCatalog.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 @@ -50,12 +50,12 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) ,m_pConnection(_pCon) ,m_xMetaData(m_pConnection->getMetaData( )) { -// osl_incrementInterlockedCount( &m_refCount ); -// refreshTables(); -// refreshViews(); -// refreshGroups(); -// refreshUsers(); -// osl_decrementInterlockedCount( &m_refCount ); +// osl_incrementInterlockedCount( &m_refCount ); +// refreshTables(); +// refreshViews(); +// refreshGroups(); +// refreshUsers(); +// osl_decrementInterlockedCount( &m_refCount ); } // ------------------------------------------------------------------------- void OCatalog::refreshTables() diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx index d75774f7de05..cc57748fe15e 100644 --- a/connectivity/source/drivers/mozab/MCatalog.hxx +++ b/connectivity/source/drivers/mozab/MCatalog.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,22 +39,22 @@ namespace connectivity class OConnection; class OCatalog : public connectivity::sdbcx::OCatalog { - OConnection* m_pConnection; // used to get the metadata + OConnection* m_pConnection; // used to get the metadata ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: // implementation of the pure virtual methods virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException); public: OCatalog(OConnection* _pCon); - OConnection* getConnection() const { return m_pConnection; } - sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + OConnection* getConnection() const { return m_pConnection; } + sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + sdbcx::OCollection* getPrivateViews() const { return m_pViews; } static const ::rtl::OUString& getDot(); }; diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx index 211a7c307542..72a35ef63d5b 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.cxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.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/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx index 5e4858062aaa..b668bba01e5f 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.hxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.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/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx index a3a838a11104..6a95f44df03a 100644 --- a/connectivity/source/drivers/mozab/MColumns.cxx +++ b/connectivity/source/drivers/mozab/MColumns.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 @@ -49,7 +49,7 @@ using namespace connectivity::sdbcx; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -68,9 +68,9 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) { if(xRow->getString(4) == _rName) { - sal_Int32 nType = xRow->getInt(5); - ::rtl::OUString sTypeName = xRow->getString(6); - sal_Int32 nPrec = xRow->getInt(7); + sal_Int32 nType = xRow->getInt(5); + ::rtl::OUString sTypeName = xRow->getString(6); + sal_Int32 nPrec = xRow->getInt(7); OColumn* pRet = new OColumn(_rName, sTypeName, diff --git a/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx index 6328dc36e1f2..ffa11ed4af10 100644 --- a/connectivity/source/drivers/mozab/MColumns.hxx +++ b/connectivity/source/drivers/mozab/MColumns.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 @@ -41,12 +41,12 @@ namespace connectivity class OColumns : public sdbcx::OCollection { protected: - OTable* m_pTable; + OTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - OColumns( OTable* _pTable, + OColumns( OTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector ) : sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector) diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index 0e4d36fe4daa..c45ee87ff8a8 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.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 @@ -190,8 +190,8 @@ namespace connectivity //------------------------------------------------------------------------- extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) { - static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString sUserProfile; + static sal_Bool bReadConfig = sal_False; + static ::rtl::OUString sUserProfile; if ( !bReadConfig ) { sUserProfile = ::connectivity::mozab::getPreferredProfileName( ); @@ -203,9 +203,9 @@ extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) //------------------------------------------------------------------------ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) { - static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString usPabDescription; - static ::rtl::OString sPabDescription; + static sal_Bool bReadConfig = sal_False; + static ::rtl::OUString usPabDescription; + static ::rtl::OString sPabDescription; if ( !bReadConfig ) { @@ -223,9 +223,9 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) //------------------------------------------------------------------------- extern "C" const sal_Char* SAL_CALL getHisDescription( void ) { - static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString usHisDescription; - static ::rtl::OString sHisDescription; + static sal_Bool bReadConfig = sal_False; + static ::rtl::OUString usHisDescription; + static ::rtl::OString sHisDescription; if ( !bReadConfig ) { diff --git a/connectivity/source/drivers/mozab/MConfigAccess.hxx b/connectivity/source/drivers/mozab/MConfigAccess.hxx index 7aa02d0b4b5e..7b66797a1f81 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.hxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.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 @@ -36,6 +36,6 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ); extern "C" const sal_Char* SAL_CALL getHisDescription( void ); -#endif // CONNECTIVITY_MOZAB_MCONFIGACCESS_HXX +#endif // CONNECTIVITY_MOZAB_MCONFIGACCESS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 68a2349a347e..cdf3c6df917c 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.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 @@ -120,7 +120,7 @@ const sal_Char* getSchemeURI( MozillaScheme _eScheme ) // ----------------------------------------------------------------------------- -OConnection::OConnection(MozabDriver* _pDriver) +OConnection::OConnection(MozabDriver* _pDriver) :OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) ,m_pDriver(_pDriver) ,m_pImplData( new ConnectionImplData ) @@ -152,7 +152,7 @@ void SAL_CALL OConnection::release() throw() void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { OSL_TRACE("IN OConnection::construct()\n" ); - // open file + // open file setURL(url); // // Skip 'sdbc:mozab: part of URL @@ -378,7 +378,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: OPreparedStatement* pPrepared = new OPreparedStatement(this,_sSql); Reference< XPreparedStatement > xReturn = pPrepared; pPrepared->lateInit(); - + m_aStatements.push_back(WeakReferenceHelper(xReturn)); return xReturn; } diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 76dcb328c2c4..4ec99a12940c 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.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,12 +56,12 @@ namespace connectivity namespace SDBCAddress { typedef enum { - Unknown = 0, - Mozilla = 1, - ThunderBird = 2, - LDAP = 3, - Outlook = 4, - OutlookExp = 5 + Unknown = 0, + Mozilla = 1, + ThunderBird = 2, + LDAP = 3, + Outlook = 4, + OutlookExp = 5 } sdbc_address_type; } @@ -96,7 +96,7 @@ namespace connectivity #endif const sal_Char* getSdbcScheme( SdbcScheme _eScheme ); - typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding + typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding struct ConnectionImplData; class OConnection : public OConnection_BASE, @@ -110,34 +110,34 @@ namespace connectivity //==================================================================== ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by // an operation - MozabDriver* m_pDriver; // Pointer to the owning + MozabDriver* m_pDriver; // Pointer to the owning // driver object ::std::auto_ptr< ConnectionImplData > m_pImplData; // This is to be able to hold a boost::shared_ptr. If we would hold it as member, it would // not compile the mozillasrc directory, since this directory is compiled without RTTI support // and boost seems to require RTTI on some platforms. // Store Catalog - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; // Start of Additions from the land of mozilla OColumnAlias m_aColumnAlias; rtl::OUString m_sMozillaURI; rtl::OUString m_sMozillaProfile; - sal_Int32 m_nMaxResultRecords; - MNameMapper* m_aNameMapper; + sal_Int32 m_nMaxResultRecords; + MNameMapper* m_aNameMapper; //LDAP only rtl::OUString m_sHostName; sal_Bool m_bUseSSL; rtl::OUString m_sBindDN; - rtl::OUString m_sUser; // the user name + rtl::OUString m_sUser; // the user name rtl::OUString m_sPassword; - SDBCAddress::sdbc_address_type m_eSDBCAddressType; + SDBCAddress::sdbc_address_type m_eSDBCAddressType; sal_Bool m_bForceLoadTable; public: virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); - OConnection(MozabDriver* _pDriver); + OConnection(MozabDriver* _pDriver); virtual ~OConnection(); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); @@ -174,7 +174,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // - MozabDriver* getDriver() const { return m_pDriver;} + MozabDriver* getDriver() const { return m_pDriver;} // Added to enable me to use SQLInterpreter which requires an // XNameAccess i/f to access tables. @@ -182,9 +182,9 @@ namespace connectivity // Additions from the land of mozilla - rtl::OUString getMozURI() const { return m_sMozillaURI; } - rtl::OUString getMozProfile() const { return m_sMozillaProfile; } - void setMozProfile(rtl::OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } + rtl::OUString getMozURI() const { return m_sMozillaURI; } + rtl::OUString getMozProfile() const { return m_sMozillaProfile; } + void setMozProfile(rtl::OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } ::com::sun::star::mozilla::MozillaProductType getProduct() { @@ -206,14 +206,14 @@ namespace connectivity sal_Bool isLDAP(void) const { return m_eSDBCAddressType == SDBCAddress::LDAP; } sal_Bool isThunderbird(void) const { return m_eSDBCAddressType == SDBCAddress::ThunderBird; } - sal_Bool isOutlookExpress() const { return m_eSDBCAddressType == SDBCAddress::OutlookExp;} - sal_Int32 getMaxResultRecords() const { return m_nMaxResultRecords; } + sal_Bool isOutlookExpress() const { return m_eSDBCAddressType == SDBCAddress::OutlookExp;} + sal_Int32 getMaxResultRecords() const { return m_nMaxResultRecords; } SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } - static ::rtl::OUString getDriverImplementationName(); + static ::rtl::OUString getDriverImplementationName(); MNameMapper* getNameMapper(); void setForceLoadTables(sal_Bool aForce){ m_bForceLoadTable = aForce;} diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index 4bcea69d2f1a..161d0bced0d3 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.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 @@ -223,7 +223,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLExceptio return nValue; } // ------------------------------------------------------------------------- -sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) +sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) { return 0; } @@ -234,7 +234,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLExcepti return nValue; } // ------------------------------------------------------------------------- -sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) +sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { // We only support a single table return 1; @@ -256,7 +256,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLExc return sal_False; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { return sal_False; } @@ -303,7 +303,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); @@ -381,7 +381,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3 return sal_False; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) +sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { return sal_False; } @@ -406,7 +406,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw return sal_False; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) +sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { return sal_False; } @@ -976,7 +976,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( ::std::vector< ::rtl::OUString > tables; ::std::vector< ::rtl::OUString > types; - if ( !m_pDbMetaDataHelper->getTableStrings( m_pConnection, tables, types ) ) + if ( !m_pDbMetaDataHelper->getTableStrings( m_pConnection, tables, types ) ) getOwnConnection()->throwSQLException( m_pDbMetaDataHelper->getError(), *this ); ::connectivity::ODatabaseMetaDataResultSet::ORows aRows; diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx index 4fb8d5f9a145..89f908367d3e 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.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 @@ -41,7 +41,7 @@ namespace connectivity class ODatabaseMetaData : public ODatabaseMetaDataBase { - OConnection* m_pConnection; + OConnection* m_pConnection; MDatabaseMetaDataHelper* m_pDbMetaDataHelper; ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw( ::com::sun::star::sdbc::SQLException ); @@ -53,7 +53,7 @@ namespace connectivity inline OConnection* getOwnConnection() const { return m_pConnection; } ODatabaseMetaData(OConnection* _pCon); - + private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information @@ -70,7 +70,7 @@ namespace connectivity virtual sal_Int32 impl_getMaxStatements_throw( ); virtual sal_Int32 impl_getMaxTablesInSelect_throw( ); virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ); - + // as I mentioned before this interface is really BIG // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index c88c6742e6b9..0b2950b3dd31 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.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 @@ -69,7 +69,7 @@ MozabDriver::~MozabDriver() void MozabDriver::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - + // when driver will be destroied so all our connections have to be destroied as well for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i) { @@ -100,7 +100,7 @@ rtl::OUString MozabDriver::getImplementationName_Static( ) throw(RuntimeExcepti //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - // which service is supported + // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< ::rtl::OUString > aSNS( 1 ); aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); @@ -149,8 +149,8 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u OSL_ENSURE( xInstance.is(), "failed to create instance" ); OConnection* pCon = reinterpret_cast<OConnection*>((*m_pCreationFunc)(this)); - xCon = pCon; // important here because otherwise the connection could be deleted inside (refcount goes -> 0) - pCon->construct(url,info); // late constructor call which can throw exception and allows a correct dtor call when so + xCon = pCon; // important here because otherwise the connection could be deleted inside (refcount goes -> 0) + pCon->construct(url,info); // late constructor call which can throw exception and allows a correct dtor call when so m_xConnections.push_back(WeakReferenceHelper(*pCon)); } @@ -161,14 +161,14 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u STR_COULD_NOT_LOAD_LIB, "$libname$", ::rtl::OUString::createFromAscii( SVLIBRARY( "mozabdrv" ) ) ) ); - + ::dbtools::throwGenericSQLException(sError,*this); } - + return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL MozabDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL MozabDriver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) @@ -203,7 +203,7 @@ Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const ::rt ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100")) ,Sequence< ::rtl::OUString >()) ); - return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); + return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } ::connectivity::SharedResources aResources; const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx index b8ea911c7db1..5684486b39b7 100644 --- a/connectivity/source/drivers/mozab/MDriver.hxx +++ b/connectivity/source/drivers/mozab/MDriver.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,13 +42,13 @@ namespace connectivity namespace mozab { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL MozabDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - + typedef void* (SAL_CALL * OMozabConnection_CreateInstanceFunction)(void* _pDriver ); typedef void (SAL_CALL * OSetMozabServiceFactory)( void* _pFactory ); typedef const void* (SAL_CALL * OGetSdbcScheme_Function)( short ); - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; enum EDriverType @@ -66,11 +66,11 @@ namespace connectivity protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xMSFactory; - ::osl::Mutex m_aMutex; // mutex is need to control member access - connectivity::OWeakRefArray m_xConnections; // vector containing a list + ::osl::Mutex m_aMutex; // mutex is need to control member access + connectivity::OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver - oslModule m_hModule; + oslModule m_hModule; OMozabConnection_CreateInstanceFunction m_pCreationFunc; OGetSdbcScheme_Function m_pSchemeFunction; diff --git a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx index bc1b4fdc07d4..94f15db36bbf 100644 --- a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx +++ b/connectivity/source/drivers/mozab/MExtConfigAccess.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/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index f8d417bf60da..c221684cbb9d 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.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 @@ -387,7 +387,7 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons // ----------------------------------------------------------------------------- void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex) { - if( !_parameterIndex || _parameterIndex > m_nNumParams) + if( !_parameterIndex || _parameterIndex > m_nNumParams) ::dbtools::throwInvalidIndexException(*this); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx index 31cfa97bc3f0..cf2dd1986e73 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.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,7 +101,7 @@ namespace connectivity void checkAndResizeParameters(sal_Int32 parameterIndex); void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x); - sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter, + sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol); void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 50aee9f216ea..8ca4e57b8166 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -71,8 +71,8 @@ using namespace com::sun::star::io; using namespace com::sun::star::util; //------------------------------------------------------------------------------ -// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ +// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); +::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.mozab.ResultSet")); } @@ -160,7 +160,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException) { - OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -377,7 +377,7 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw( if (cardNumber == m_nUpdatedRow) { //write back the changes first - if (!pushCard(cardNumber)) //error write back the changes + if (!pushCard(cardNumber)) //error write back the changes throw SQLException(); } } @@ -621,11 +621,11 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const Sequence< Property > aProps(5); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); - DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); + DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); } @@ -1452,9 +1452,9 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, sal_Bool OResultSet::isCount() const { return (m_pParseTree && - m_pParseTree->count() > 2 && - SQL_ISRULE(m_pParseTree->getChild(2),scalar_exp_commalist) && - SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0),derived_column) && + m_pParseTree->count() > 2 && + SQL_ISRULE(m_pParseTree->getChild(2),scalar_exp_commalist) && + SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0),derived_column) && SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0)->getChild(0),general_set_fct) && m_pParseTree->getChild(2)->getChild(0)->getChild(0)->count() == 4 ); @@ -1495,7 +1495,7 @@ sal_Bool OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) impl_ensureKeySet(); if (m_CurrentRowCount < nMaxCardNumber) { - sal_Int32 nKeyValue; + sal_Int32 nKeyValue; if ( (sal_Int32)m_pKeySet->get().capacity() < nMaxCardNumber ) m_pKeySet->get().reserve(nMaxCardNumber + 20 ); @@ -1564,7 +1564,7 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) { nCurCard = (m_pKeySet->get())[nCurPos-1]; } - else //The requested row has not been retrived until now. We should get the right card for it. + else //The requested row has not been retrived until now. We should get the right card for it. nCurCard = nCurPos + deletedCount(); while ( nCurCard > nNumberOfRecords && !m_aQuery.queryComplete() ) { @@ -1908,7 +1908,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE ResultSetEntryGuard aGuard( *this ); m_nOldRowPos = m_nRowPos; - if (!m_nNewRow) //no new row now, insert one + if (!m_nNewRow) //no new row now, insert one { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkPendingUpdate(); diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index 47e9ad13d276..a39cb0e7e007 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -55,7 +55,7 @@ namespace connectivity { /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -72,21 +72,21 @@ namespace connectivity typedef sal_Int64 TVoidPtr; - typedef ::std::allocator< TVoidPtr > TVoidAlloc; - typedef ::std::vector<TVoidPtr> TVoidVector; + typedef ::std::allocator< TVoidPtr > TVoidAlloc; + typedef ::std::vector<TVoidPtr> TVoidVector; - class OResultSet : public comphelper::OBaseMutex, - public OResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + class OResultSet : public comphelper::OBaseMutex, + public OResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { protected: - OCommonStatement* m_pStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; + OCommonStatement* m_pStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - sal_uInt32 m_nRowPos; - sal_uInt32 m_nOldRowPos; - sal_Bool m_bWasNull; + sal_uInt32 m_nRowPos; + sal_uInt32 m_nOldRowPos; + sal_Bool m_bWasNull; sal_Int32 m_nFetchSize; sal_Int32 m_nResultSetType; sal_Int32 m_nFetchDirection; @@ -232,7 +232,7 @@ namespace connectivity protected: MQuery m_aQuery; OTable* m_pTable; - sal_Int32 m_CurrentRowCount; + sal_Int32 m_CurrentRowCount; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTableColumns; @@ -244,13 +244,13 @@ protected: OValueRow m_aParameterRow; ::std::vector< ::rtl::OUString> m_aAttributeStrings; sal_Int32 m_nParamIndex; - sal_Bool m_bIsAlwaysFalseQuery; + sal_Bool m_bIsAlwaysFalseQuery; ::rtl::Reference<OKeySet> m_pKeySet; OSortIndex* m_pSortIndex; - sal_Int32 m_nNewRow; //inserted row - sal_Int32 m_nUpdatedRow; //updated row - sal_Int32 m_RowStates; - sal_Int32 m_bIsReadOnly; + sal_Int32 m_nNewRow; //inserted row + sal_Int32 m_nUpdatedRow; //updated row + sal_Int32 m_RowStates; + sal_Int32 m_bIsReadOnly; inline void resetParameters() { m_nParamIndex = 0; } ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns @@ -282,7 +282,7 @@ protected: sal_Bool validRow( sal_uInt32 nRow ); sal_Bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 ); sal_Int32 deletedCount(); - sal_Bool fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them + sal_Bool fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them sal_Int32 getRowForCardNumber(sal_Int32 nCardNum); const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx index 99894fb750e1..170cf18e2488 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.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 @@ -83,7 +83,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) -{ +{ return ::rtl::OUString(); } // ------------------------------------------------------------------------- @@ -193,9 +193,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQL sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - sal_Bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && + sal_Bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && ::cppu::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))); - + return m_bReadOnly || bReadOnly || m_pTable->isReadOnly(); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx index e04668070dfc..134089fb40a7 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.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,18 +44,18 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; - class OResultSetMetaData : public OResultSetMetaData_BASE + class OResultSetMetaData : public OResultSetMetaData_BASE { ::rtl::OUString m_aTableName; ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; OTable* m_pTable; - sal_Bool m_bReadOnly; + sal_Bool m_bReadOnly; protected: virtual ~OResultSetMetaData(); public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - // OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){} + // OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){} OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, const ::rtl::OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly ) diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 8fcca8ee58f4..24be4a1be71f 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.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 @@ -121,8 +121,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -178,7 +178,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere OMozillaBootstrap_CreateInstanceFunction s_pCreationFunc = (OMozillaBootstrap_CreateInstanceFunction)osl_getFunctionSymbol(s_hModule, sFactoryCreationFunc.pData); if (NULL == s_pCreationFunc) - { // did not find the symbol + { // did not find the symbol OSL_ENSURE(sal_False, "MozabDriver::registerClient: could not find the symbol for creating the factory!"); osl_unloadModule(s_hModule); s_hModule = NULL; diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index 709676b21966..e00ab8db2a3e 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.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 @@ -125,7 +125,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); @@ -157,7 +157,7 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) OSL_ENSURE(xCreateColumn.is(), "Need the Columns!!"); const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias(); - + OSQLColumns::Vector::const_iterator aIter = xCreateColumn->get().begin(); const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); ::rtl::OUString sName; @@ -166,7 +166,7 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) (*aIter)->getPropertyValue(sProprtyName) >>= sName; if ( !aColumnAlias.hasAlias( sName ) ) { - + const ::rtl::OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", sName @@ -393,12 +393,12 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc Sequence< Property > aProps(9); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -491,7 +491,7 @@ void OCommonStatement::createColumnMapping() size_t i; // initialize the column index map (mapping select columns to table columns) - ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns(); + ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns(); m_aColMapping.resize(xColumns->get().size() + 1); for (i=0; i<m_aColMapping.size(); ++i) m_aColMapping[i] = i; @@ -535,7 +535,7 @@ void OCommonStatement::analyseSQL() } } //------------------------------------------------------------------ -void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, +void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, OSQLParseNode* pAscendingDescending) { ::rtl::OUString aColumnName; diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index 41775540713c..de1a75d68f9d 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.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 @@ -58,7 +58,7 @@ namespace connectivity { class OResultSet; - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE; @@ -70,9 +70,9 @@ namespace connectivity typedef ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE > OCommonStatement_SBASE; class OCommonStatement :public comphelper::OBaseMutex - ,public OCommonStatement_IBASE - ,public ::cppu::OPropertySetHelper - ,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement > + ,public OCommonStatement_IBASE + ,public ::cppu::OPropertySetHelper + ,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement > ,public OCommonStatement_SBASE { friend class ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE >; @@ -87,11 +87,11 @@ namespace connectivity // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; - - OTable* m_pTable; - OConnection* m_pConnection; // The owning Connection object + ::std::list< ::rtl::OUString> m_aBatchList; + OTable* m_pTable; + OConnection* m_pConnection; // The owning Connection object + OValueRow m_aRow; connectivity::OSQLParser m_aParser; @@ -100,7 +100,7 @@ namespace connectivity connectivity::OSQLParseNode* m_pParseTree; - ::std::vector<sal_Int32> m_aColMapping; + ::std::vector<sal_Int32> m_aColMapping; ::std::vector<sal_Int32> m_aOrderbyColumnNumber; ::std::vector<TAscendingOrder> m_aOrderbyAscending; @@ -120,7 +120,7 @@ namespace connectivity throw (::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); + const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; @@ -155,7 +155,7 @@ namespace connectivity void analyseSQL(); void setOrderbyColumn( connectivity::OSQLParseNode* pColumnRef, connectivity::OSQLParseNode* pAscendingDescending); - virtual void createTable( ) throw ( + virtual void createTable( ) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); public: @@ -193,7 +193,7 @@ namespace connectivity using OPropertySetHelper::getFastPropertyValue; }; - class OStatement : public OCommonStatement, + class OStatement : public OCommonStatement, public ::com::sun::star::lang::XServiceInfo { protected: diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx index ddfaed031770..d122794a64c1 100644 --- a/connectivity/source/drivers/mozab/MTable.cxx +++ b/connectivity/source/drivers/mozab/MTable.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/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx index 3cc6728fe156..7f1826257f15 100644 --- a/connectivity/source/drivers/mozab/MTable.hxx +++ b/connectivity/source/drivers/mozab/MTable.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,13 +39,13 @@ namespace connectivity { typedef ::connectivity::OTableHelper OTable_Base; - class OTable : public OTable_Base + class OTable : public OTable_Base { OConnection* m_pConnection; public: - OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection); - OTable( sdbcx::OCollection* _pTables, + OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection); + OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index b01c8fe9d6b2..ebc913845e30 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.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 @@ -61,14 +61,14 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) ::rtl::OUString aName,aSchema; // sal_Int32 nLen = _rName.indexOf('.'); // aSchema = _rName.copy(0,nLen); - // aName = _rName.copy(nLen+1); + // aName = _rName.copy(nLen+1); aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); - // aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")); - // aTypes[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEMTABLE")); + // aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")); + // aTypes[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEMTABLE")); ::rtl::OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); @@ -79,7 +79,7 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) Reference< XRow > xRow(xResult,UNO_QUERY); if(xResult->next()) // there can be only one table with this name { - OTable* pRet = new OTable( this, static_cast<OCatalog&>(m_rParent).getConnection(), + OTable* pRet = new OTable( this, static_cast<OCatalog&>(m_rParent).getConnection(), aName,xRow->getString(4),xRow->getString(5)); xRet = pRet; } diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx index 56ed3d001d3e..437bbbe6c558 100644 --- a/connectivity/source/drivers/mozab/MTables.hxx +++ b/connectivity/source/drivers/mozab/MTables.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 @@ -37,7 +37,7 @@ namespace connectivity class OTables : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - // OCatalog* m_pParent; + // OCatalog* m_pParent; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index b4cc37bb2f03..b50a03d50ca7 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.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 @@ -102,7 +102,7 @@ rtl::OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeEx //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException) { - // which service is supported + // which service is supported // for more information @see com.sun.star.mozilla.MozillaBootstrap Sequence< ::rtl::OUString > aSNS( 1 ); aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); @@ -227,7 +227,7 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( && ( aCode->getProductType() != currProduct || !profileName.equals(currProfileName)) ) setCurrentProfile(aCode->getProductType(),profileName); MNSRunnable xRunnable; - + return xRunnable.StartProxy(aCode);; #else (void)aCode; /* avoid warning about unused parameter */ diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 5a3f609ea90f..d605d4bb0a59 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.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 @@ -40,7 +40,7 @@ namespace connectivity { namespace mozab { - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::mozilla::XMozillaBootstrap, + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::mozilla::XMozillaBootstrap, ::com::sun::star::lang::XServiceInfo > OMozillaBootstrap_BASE; class ProfileAccess; class ProfileManager; @@ -49,11 +49,11 @@ namespace connectivity protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xMSFactory; - ::osl::Mutex m_aMutex; // mutex is need to control member access + ::osl::Mutex m_aMutex; // mutex is need to control member access virtual ~MozillaBootstrap(); protected: ProfileAccess * m_ProfileAccess; - ProfileManager * m_ProfileManager; + ProfileManager * m_ProfileManager; public: void Init(); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index f16c8f481a6f..240d8a8a597e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.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 @@ -52,7 +52,7 @@ using namespace ::com::sun::star::mozilla; namespace { - #if defined(XP_MAC) || defined(XP_MACOSX) || defined(MACOSX) + #if defined(XP_MAC) || defined(XP_MACOSX) || defined(MACOSX) #define APP_REGISTRY_NAME "Application Registry" #elif defined(XP_WIN) || defined(XP_OS2) #define APP_REGISTRY_NAME "registry.dat" diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx index e6de431e53a5..3ddf002c34fa 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.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/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index 7e523f44e7fd..d8f8d6505532 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.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 @@ -35,10 +35,10 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce { OUString iniUrl; if (osl_File_E_None != osl_getFileURLFromSystemPath(rIniName.pData, &iniUrl.pData)) - return; - + return; + -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 OString sFile = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); OSL_TRACE(__FILE__" -- parser() - %s\n", sFile.getStr()); #endif @@ -50,17 +50,17 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce } catch(::com::sun::star::io::IOException e) { -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 OString file_tmp = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); OSL_TRACE( __FILE__" -- couldn't open file: %s", file_tmp.getStr() ); #endif } - + if (osl_File_E_None == fileError) { rtl::ByteSequence seq; sal_uInt64 nSize = 0; - + osl_getFileSize(handle, &nSize); OUString sectionName = OUString::createFromAscii("no name section"); while (true) @@ -84,7 +84,7 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce aSection->lList.push_back(nameValue); } - else + else { sal_Int32 nIndexStart = line.indexOf('['); sal_Int32 nIndexEnd = line.indexOf(']'); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index 9fb0588ef26e..efe78e8a8ae4 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.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/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx index 8e2cf5deed40..1cffe198ba46 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.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 @@ -45,9 +45,9 @@ #include <osl/thread.hxx> #include <MNSTerminateListener.hxx> -static nsIServiceManager* sServiceManager = nsnull; -static sal_Int32 sInitCounter = 0; -static sal_Bool s_bProfilePresentAfterInitialized = sal_False; +static nsIServiceManager* sServiceManager = nsnull; +static sal_Int32 sInitCounter = 0; +static sal_Bool s_bProfilePresentAfterInitialized = sal_False; static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); @@ -84,9 +84,9 @@ extern "C" void NS_SetupRegistry(); { // compare the current and the preferred profile // (by looping through the characters) - const PRUnichar* pCurrent = *pLoop; - const PRUnichar* pPref = pPreferredProfile; - while ( *pCurrent && ( *pCurrent == *pPref ) ) // testing one of them against 0 is enough because of the second clause + const PRUnichar* pCurrent = *pLoop; + const PRUnichar* pPref = pPreferredProfile; + while ( *pCurrent && ( *pCurrent == *pPref ) ) // testing one of them against 0 is enough because of the second clause { ++pCurrent; ++pPref; @@ -152,8 +152,8 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) // Initialise XPCOM NS_InitXPCOM2(&sServiceManager, binDir, NULL); -// if (!sServiceManager) -// return sal_False; +// if (!sServiceManager) +// return sal_False; #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM sXPCOMInitializedFlag = PR_TRUE; @@ -173,10 +173,10 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) eventQService->CreateThreadEventQueue(); -// nsCOMPtr<nsIObserver> mStartupNotifier = do_CreateInstance(NS_APPSTARTUPNOTIFIER_CONTRACTID, &rv); -// if(NS_FAILED(rv)) -// return rv; -// mStartupNotifier->Observe(nsnull, APPSTARTUP_TOPIC, nsnull); +// nsCOMPtr<nsIObserver> mStartupNotifier = do_CreateInstance(NS_APPSTARTUPNOTIFIER_CONTRACTID, &rv); +// if(NS_FAILED(rv)) +// return rv; +// mStartupNotifier->Observe(nsnull, APPSTARTUP_TOPIC, nsnull); #ifdef HACK_AROUND_THREADING_ISSUES // XXX force certain objects to be created on the main thread @@ -275,7 +275,7 @@ extern "C" void MNS_Mozilla_UI_Thread( void *arg ) #endif } - m_aUI_Thread_Condition.set(); //release all blocks + m_aUI_Thread_Condition.set(); //release all blocks OSL_TRACE( "OUT : MNS_Mozilla_UI_Thread() \n" ); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx index 0ccd4322539c..bfc141cc582c 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.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/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index 71620b07475f..54d4879acb9e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.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 @@ -276,7 +276,7 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile) } // -// // Do the profile switch +// // Do the profile switch gDirServiceProvider->SetProfileDir(profileDir); mCurrentProfileName.Assign(aCurrentProfile); // gProfileDataAccess->SetCurrentProfile(aCurrentProfile); @@ -326,7 +326,7 @@ NS_IMETHODIMP nsProfile::ShutDownCurrentProfile(PRUint32 shutDownType) // if shutDownType is not a well know value, skip the notifications // see DoOnShutdown() in nsAppRunner.cpp for where we use this behaviour to our benefit if (shutDownType == (PRUint32)SHUTDOWN_PERSIST || shutDownType == (PRUint32)SHUTDOWN_CLEANSE ) { - nsCOMPtr<nsIObserverService> observerService = + nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv); NS_ENSURE_TRUE(observerService, NS_ERROR_FAILURE); @@ -335,7 +335,7 @@ NS_IMETHODIMP nsProfile::ShutDownCurrentProfile(PRUint32 shutDownType) NS_NAMED_LITERAL_STRING(cleanseString, "shutdown-cleanse"); NS_NAMED_LITERAL_STRING(persistString, "shutdown-persist"); const nsAFlatString& context = (shutDownType == (PRUint32)SHUTDOWN_CLEANSE) ? cleanseString : persistString; - + // Phase 1: See if anybody objects to the profile being changed. mProfileChangeVetoed = PR_FALSE; observerService->NotifyObservers(subject, "profile-approve-change", context.get()); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx index 723af162ab5b..37939c4acc9f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.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/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx index 279faa7f2318..ef6a88917b82 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.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/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx index 434c9e3af390..2efe91623318 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.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/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index dbf1c598b5c8..dbcd90509226 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.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 @@ -116,7 +116,7 @@ namespace connectivity profileName = aProfileName; profilePath = aProfilePath; } - ::rtl::OUString ProfileStruct::getProfilePath() + ::rtl::OUString ProfileStruct::getProfilePath() { #ifdef MINIMAL_PROFILEDISCOVER return profilePath; @@ -149,7 +149,7 @@ namespace connectivity LoadMozillaProfiles(); #endif sal_Int32 count=static_cast<sal_Int32>(m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size()); - + //load thunderbird profiles to m_ProductProfileList count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird); @@ -186,7 +186,7 @@ namespace connectivity nsCOMPtr<nsIEnumerator> enumKeys; nsRegistryKey profilesTreeKey; - + //step 3:Enumerator it rv = registry->GetKey(nsIRegistry::Common, // PRUnichar != sal_Unicode in mingw @@ -293,7 +293,7 @@ namespace connectivity ::rtl::OUString profilePath; ::rtl::OUString sIsRelative; ::rtl::OUString sIsDefault; - + for(NameValueList::iterator itor=aSection->lList.begin(); itor != aSection->lList.end(); itor++) @@ -323,7 +323,7 @@ namespace connectivity { isRelative = sIsRelative.toInt32(); } - + #ifndef MINIMAL_PROFILEDISCOVER nsCOMPtr<nsILocalFile> rootDir; rv = NS_NewLocalFile(EmptyString(), PR_TRUE, @@ -332,7 +332,7 @@ namespace connectivity OString sPath = OUStringToOString(profilePath, RTL_TEXTENCODING_UTF8); nsCAutoString filePath(sPath.getStr()); - + if (isRelative) { // PRUnichar != sal_Unicode in mingw nsAutoString registryDir( reinterpret_cast_mingw_only<const PRUnichar *>(regDir.getStr()) ); @@ -365,7 +365,7 @@ namespace connectivity m_Product.mCurrentProfileName = profileName; } - + } return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } @@ -374,7 +374,7 @@ namespace connectivity { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; - if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) + if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) { //Profile not found return ::rtl::OUString(); @@ -403,7 +403,7 @@ namespace connectivity list[i] = aProfile->getProfileName(); i++; } - + return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } @@ -431,11 +431,11 @@ namespace connectivity nsAutoString path; aFile->GetPath(path); rv = aFile->Exists(bExist); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); if (!*bExist) { rv = aFile->IsSymlink(bExist); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); } return rv; } @@ -456,29 +456,29 @@ namespace connectivity PRBool isDir; rv = aFile->IsDirectory(&isDir); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); if (!isDir) return NS_ERROR_FILE_NOT_DIRECTORY; nsCOMPtr<nsILocalFile> lockFile; rv = aFile->Clone((nsIFile **)((void **)getter_AddRefs(lockFile))); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); rv = lockFile->Append(LOCKFILE_NAME); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); PRBool nExist=PR_FALSE; rv = isExistFileOrSymlink(lockFile,&nExist); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); if (!nExist) // Check OLD_LOCKFILE_NAME { nsCOMPtr<nsILocalFile> oldlockFile; rv = aFile->Clone((nsIFile **)((void **)getter_AddRefs(oldlockFile))); - NS_ENSURE_SUCCESS(rv, rv); - + NS_ENSURE_SUCCESS(rv, rv); + rv = oldlockFile->Append(OLD_LOCKFILE_NAME); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); rv = isExistFileOrSymlink(oldlockFile,&nExist); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); } return nExist; } @@ -506,7 +506,7 @@ namespace connectivity PRBool exists = PR_FALSE; rv = localFile->Exists(&exists); - NS_ENSURE_SUCCESS(rv, sal_True); + NS_ENSURE_SUCCESS(rv, sal_True); if (!exists) return sal_True; @@ -522,7 +522,7 @@ namespace connectivity { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; - if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) + if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) { return sal_False; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index f2f85ddd77ee..1ce1617bad81 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.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 @@ -77,7 +77,7 @@ namespace connectivity ::rtl::OUString getProfileName(){ return profileName;} ::rtl::OUString getProfilePath() ; #ifndef MINIMAL_PROFILEDISCOVER - nsILocalFile *getProfileLocal(){ return profilePath;} + nsILocalFile *getProfileLocal(){ return profilePath;} #endif protected: MozillaProductType product; @@ -104,7 +104,7 @@ namespace connectivity { public: - virtual ~ProfileAccess(); + virtual ~ProfileAccess(); ProfileAccess(); ::rtl::OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); ::sal_Int32 getProfileCount( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx index 84684056f557..2978c16fa152 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.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/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx index 6e52c40b8f71..5cbc352684c2 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.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 @@ -58,7 +58,7 @@ namespace connectivity { public: - virtual ~ProfileManager(); + virtual ~ProfileManager(); ProfileManager(); ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx index c950e4d0e7e0..646121553236 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.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 @@ -51,7 +51,7 @@ using namespace connectivity::mozab; /* Implementation file */ NS_IMPL_ISUPPORTS1(MNSRunnable, nsIRunnable) -static ::osl::Mutex m_aThreadMutex; +static ::osl::Mutex m_aThreadMutex; nsIRunnable * MNSRunnable::ProxiedObject() { diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx index 2f17ea53f556..093e2d157c07 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.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 virtual ~MNSRunnable(); NS_DECL_ISUPPORTS NS_DECL_NSIRUNNABLE - + public: sal_Int32 StartProxy(const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode); //Call this to start proxy diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h index f03d4a3bb208..e34bc21913d6 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h @@ -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/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h index 3d01a103c9e2..4d65bc3cb54d 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h @@ -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/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h index ec9bd9d63d74..4bb836ed1355 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h @@ -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/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h index 75913dcd525c..03198dcab850 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h @@ -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/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h index 4208eb6db606..1579b16947fc 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h @@ -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/source/drivers/mozab/bootstrap/post_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h index b029a0e23638..a33bd622ac88 100644 --- a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h +++ b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h @@ -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/source/drivers/mozab/bootstrap/pre_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h index 15eeb5395195..792e8a34f46a 100644 --- a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h +++ b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h @@ -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/source/drivers/mozab/mozab.xcu b/connectivity/source/drivers/mozab/mozab.xcu index c92209e09e5a..837e180ba50d 100755 --- a/connectivity/source/drivers/mozab/mozab.xcu +++ b/connectivity/source/drivers/mozab/mozab.xcu @@ -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 @@ -34,7 +34,7 @@ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> <value xml:lang="en-US">Microsoft Outlook Address Book</value> </prop> - <node oor:name="Features"> + <node oor:name="Features"> <node oor:name="EscapeDateTime" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> @@ -49,7 +49,7 @@ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> <value xml:lang="en-US">Microsoft Windows Address Book</value> </prop> - <node oor:name="Features"> + <node oor:name="Features"> <node oor:name="EscapeDateTime" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> diff --git a/connectivity/source/drivers/mozab/mozab.xml b/connectivity/source/drivers/mozab/mozab.xml index 6663387cf34c..33e9219a1610 100644 --- a/connectivity/source/drivers/mozab/mozab.xml +++ b/connectivity/source/drivers/mozab/mozab.xml @@ -11,8 +11,8 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service> com.sun.star.sdbc.Driver </supported-service> - <service-dependency> ... </service-dependency> + <supported-service> com.sun.star.sdbc.Driver </supported-service> + <service-dependency> ... </service-dependency> </component-description> <component-description> <Author>Wind Li</Author> @@ -23,57 +23,57 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service> com.sun.star.mozilla.MozillaBootstrap</supported-service> - <service-dependency> ... </service-dependency> + <supported-service> com.sun.star.mozilla.MozillaBootstrap</supported-service> + <service-dependency> ... </service-dependency> </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu1 </runtime-module-dependency> - <runtime-module-dependency> sal1 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu1 </runtime-module-dependency> + <runtime-module-dependency> sal1 </runtime-module-dependency> - <type> com.sun.star.util.XCancellable </type> - <type> com.sun.star.util.XNumberFormatter </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> - <type> com.sun.star.beans.XPropertyState </type> - <type> com.sun.star.beans.XPropertySet </type> - <type> com.sun.star.beans.PropertyValue </type> - <type> com.sun.star.beans.XMultiPropertySet </type> - <type> com.sun.star.beans.XFastPropertySet </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.EventObject </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.java.XJavaThreadRegister_11 </type> - <type> com.sun.star.java.XJavaVM </type> - <type> com.sun.star.sdbc.XConnection </type> - <type> com.sun.star.sdbc.XStatement </type> - <type> com.sun.star.sdbc.XResultSet </type> - <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> - <type> com.sun.star.sdbc.XColumnLocate </type> - <type> com.sun.star.sdbc.XResultSetUpdate </type> - <type> com.sun.star.sdbc.XWarningsSupplier </type> - <type> com.sun.star.sdbc.XRowUpdate </type> - <type> com.sun.star.sdbc.XMultipleResults </type> - <type> com.sun.star.sdbc.XBatchExecution </type> - <type> com.sun.star.sdbc.XPreparedBatchExecution </type> - <type> com.sun.star.sdbc.XParameters </type> - <type> com.sun.star.sdbc.XOutParameters </type> - <type> com.sun.star.sdbc.DriverPropertyInfo </type> - <type> com.sun.star.sdbc.XRow </type> - <type> com.sun.star.sdb.XColumnUpdate </type> - <type> com.sun.star.sdb.XColumn </type> - <type> com.sun.star.sdbc.XResultSetUpdate </type> - <type> com.sun.star.sdbc.XRowUpdate </type> - <type> com.sun.star.sdbcx.XRowLocate </type> - <type> com.sun.star.sdbcx.XDeleteRows </type> + <type> com.sun.star.util.XCancellable </type> + <type> com.sun.star.util.XNumberFormatter </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.beans.XPropertyState </type> + <type> com.sun.star.beans.XPropertySet </type> + <type> com.sun.star.beans.PropertyValue </type> + <type> com.sun.star.beans.XMultiPropertySet </type> + <type> com.sun.star.beans.XFastPropertySet </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.EventObject </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.java.XJavaThreadRegister_11 </type> + <type> com.sun.star.java.XJavaVM </type> + <type> com.sun.star.sdbc.XConnection </type> + <type> com.sun.star.sdbc.XStatement </type> + <type> com.sun.star.sdbc.XResultSet </type> + <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> + <type> com.sun.star.sdbc.XColumnLocate </type> + <type> com.sun.star.sdbc.XResultSetUpdate </type> + <type> com.sun.star.sdbc.XWarningsSupplier </type> + <type> com.sun.star.sdbc.XRowUpdate </type> + <type> com.sun.star.sdbc.XMultipleResults </type> + <type> com.sun.star.sdbc.XBatchExecution </type> + <type> com.sun.star.sdbc.XPreparedBatchExecution </type> + <type> com.sun.star.sdbc.XParameters </type> + <type> com.sun.star.sdbc.XOutParameters </type> + <type> com.sun.star.sdbc.DriverPropertyInfo </type> + <type> com.sun.star.sdbc.XRow </type> + <type> com.sun.star.sdb.XColumnUpdate </type> + <type> com.sun.star.sdb.XColumn </type> + <type> com.sun.star.sdbc.XResultSetUpdate </type> + <type> com.sun.star.sdbc.XRowUpdate </type> + <type> com.sun.star.sdbcx.XRowLocate </type> + <type> com.sun.star.sdbcx.XDeleteRows </type> </module-description> diff --git a/connectivity/source/drivers/mozab/mozab2.xcu b/connectivity/source/drivers/mozab/mozab2.xcu index e7c24143f5a1..898c099fc7d2 100755 --- a/connectivity/source/drivers/mozab/mozab2.xcu +++ b/connectivity/source/drivers/mozab/mozab2.xcu @@ -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/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 28cc64d707ba..2e08d7754bd3 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.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 @@ -48,7 +48,7 @@ #include "MNSMozabProxy.hxx" #include <MNSDeclares.hxx> -static ::osl::Mutex m_aMetaMutex; +static ::osl::Mutex m_aMetaMutex; #include <osl/diagnose.h> #include <com/sun/star/uno/Reference.hxx> @@ -201,10 +201,10 @@ static nsresult insertPABDescription() #define NS_ABDIRECTORYDATASOURCE_CONTRACTID \ NS_RDF_DATASOURCE_CONTRACTID_PREFIX "addressdirectory" #define database_uri "@mozilla.org/rdf/datasource;1?name=addressdirectory" -#define NS_ABDIRECTORYDATASOURCE_CID \ -{ /* 0A79186D-F754-11d2-A2DA-001083003D0C */ \ - 0xa79186d, 0xf754, 0x11d2, \ - {0xa2, 0xda, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc} \ +#define NS_ABDIRECTORYDATASOURCE_CID \ +{ /* 0A79186D-F754-11d2-A2DA-001083003D0C */ \ + 0xa79186d, 0xf754, 0x11d2, \ + {0xa2, 0xda, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc} \ } // ------------------------------------------------------------------------- @@ -262,7 +262,7 @@ static nsresult enumSubs(nsISimpleEnumerator * subDirs,nsISupportsArray * array) { PRBool hasMore = PR_TRUE ; nsresult rv = NS_OK ; - while (NS_SUCCEEDED(subDirs->HasMoreElements(&hasMore)) && hasMore) { + while (NS_SUCCEEDED(subDirs->HasMoreElements(&hasMore)) && hasMore) { nsCOMPtr<nsISupports> newDirSupports ; rv = subDirs->GetNext(getter_AddRefs(newDirSupports)) ; @@ -482,9 +482,9 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* ::std::vector< ::rtl::OUString >& _rStrings, ::std::vector< ::rtl::OUString >& _rTypes) { - sal_Bool bGivenURI; - ::rtl::OUString sAbURI; - ::rtl::OString sAbURIString; + sal_Bool bGivenURI; + ::rtl::OUString sAbURI; + ::rtl::OString sAbURIString; OSL_TRACE( "IN MDatabaseMetaDataHelper::getTableStrings( 0x%08X, %s)\n", _pCon, _pCon->getForceLoadTables()?"True":"False" ); @@ -601,7 +601,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* args.arg4 = (void*)&m_aTableNames; args.arg5 = (void*)&m_aTableTypes; args.arg6 = (void*)&nErrorResourceId; - rv = xMProxy.StartProxy(&args,m_ProductType,m_ProfileName); + rv = xMProxy.StartProxy(&args,m_ProductType,m_ProfileName); m_aError.setResId( static_cast<sal_uInt16>(nErrorResourceId) ); if (NS_FAILED(rv)) @@ -720,7 +720,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) { args.funcIndex = ProxiedFunc::FUNC_TESTLDAP_IS_LDAP_CONNECTED; TimeValue timeValue = { 1, 0 }; // 1 * 30 Seconds timeout - sal_Int32 times=0; + sal_Int32 times=0; while ( times++ < 30 ) { rv = xMProxy.StartProxy( &args, m_ProductType, ::rtl::OUString() ); @@ -742,7 +742,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl::OUString & aTableName) { - sal_Bool bIsMozillaAB; + sal_Bool bIsMozillaAB; bIsMozillaAB = !_pCon->usesFactory() && ! _pCon->isLDAP(); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx index 77de88b2f07d..103903ac36d0 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.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,7 +49,7 @@ namespace connectivity ::std::vector< ::rtl::OUString > m_aTableNames; ::std::vector< ::rtl::OUString > m_aTableTypes; ::com::sun::star::mozilla::MozillaProductType m_ProductType; - ::rtl::OUString m_ProfileName; + ::rtl::OUString m_ProfileName; ErrorDescriptor m_aError; public: diff --git a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx index c7f1dffd83c4..d6bfe02b23e9 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.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/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index 2719c72dd98e..0064cca35160 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -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/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx index c7b5224893da..54461bfc2222 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.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/source/drivers/mozab/mozillasrc/MNSDeclares.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx index 0ef193cc3bd8..de53040895a7 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.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 @@ -27,16 +27,16 @@ ************************************************************************/ #ifndef _CONNECTIVITY_MAB_NS_DECLARES_HXX_ -#define _CONNECTIVITY_MAB_NS_DECLARES_HXX_ +#define _CONNECTIVITY_MAB_NS_DECLARES_HXX_ #include <sal/types.h> -const sal_Int32 RowStates_Normal = 0; -const sal_Int32 RowStates_Inserted = 1; -const sal_Int32 RowStates_Updated = 2; -const sal_Int32 RowStates_Deleted = 4; -const sal_Int32 RowStates_Error = 32; +const sal_Int32 RowStates_Normal = 0; +const sal_Int32 RowStates_Inserted = 1; +const sal_Int32 RowStates_Updated = 2; +const sal_Int32 RowStates_Deleted = 4; +const sal_Int32 RowStates_Error = 32; namespace connectivity{ namespace mozab{ diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx index b3e75c3763bb..4dd1c511f1f2 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.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/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index df81bb886b5e..02cdcea1fea4 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.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 @@ -64,7 +64,7 @@ using namespace connectivity::mozab; /* Implementation file */ -static ::osl::Mutex m_aThreadMutex; +static ::osl::Mutex m_aThreadMutex; extern nsresult NewAddressBook(const ::rtl::OUString * aName); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx index 06c13993edda..85d63373818a 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.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,11 +61,11 @@ namespace connectivity { sal_Int32 funcIndex; //Function Index sal_Int32 argCount; //parameter count - void * arg1; - void * arg2; - void * arg3; - void * arg4; - void * arg5; + void * arg1; + void * arg2; + void * arg3; + void * arg4; + void * arg5; void * arg6; RunArgs() { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx index d411119e5281..92967f77e8d6 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.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 @@ -33,7 +33,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <MNSInit.hxx> - + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx index 85e36e8abacd..16a27c7702ac 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.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,7 +49,7 @@ private: public: MNSTerminateListener(); - virtual ~MNSTerminateListener(); + virtual ~MNSTerminateListener(); public: static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> mxTerminateListener; static void addTerminateListener(); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx index d3627772369b..e6e394474894 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.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/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx index 6fdbcea39938..46651383c4cb 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.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 @@ -41,7 +41,7 @@ namespace connectivity { namespace mozab { - class MNameMapper + class MNameMapper { private: @@ -69,10 +69,10 @@ namespace connectivity // May modify the name passed in so that it's unique nsresult add( ::rtl::OUString& str, nsIAbDirectory* abook ); - + //reset dirs void reset(); - + // Get the directory corresponding to str bool getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook ); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index d3510e9d0d07..a78b9abed55c 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.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/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx index d068fc0315ba..8015c3a74cbd 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.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 @@ -208,7 +208,7 @@ namespace connectivity const OColumnAlias& m_rColumnAlias; ::com::sun::star::mozilla::MozillaProductType m_Product; - ::rtl::OUString m_Profile; + ::rtl::OUString m_Profile; ErrorDescriptor m_aError; void construct(); @@ -226,14 +226,14 @@ namespace connectivity sal_Int32 executeQuery(OConnection* _pCon); sal_Int32 executeQueryProxied(OConnection* _pCon); //Used only by MNSMozabProxy - sal_Int32 createNewCard(); //return Row count number - sal_Int32 deleteRow(const sal_Int32 rowIndex); - sal_Int32 commitRow(const sal_Int32 rowIndex); - sal_Bool resyncRow(sal_Int32 nDBRow); + sal_Int32 createNewCard(); //return Row count number + sal_Int32 deleteRow(const sal_Int32 rowIndex); + sal_Int32 commitRow(const sal_Int32 rowIndex); + sal_Bool resyncRow(sal_Int32 nDBRow); - sal_Bool isWritable(OConnection* _pCon); + sal_Bool isWritable(OConnection* _pCon); - sal_uInt32 InsertLoginInfo(OConnection* _pCon); + sal_uInt32 InsertLoginInfo(OConnection* _pCon); void setAddressbook( ::rtl::OUString&); ::rtl::OUString getAddressbook(void) const; @@ -261,14 +261,14 @@ namespace connectivity sal_Int32 nDBRow, const rtl::OUString& aDBColumnName, sal_Int32 nType ) const; - sal_Int32 getRowStates(sal_Int32 nDBRow); - sal_Bool setRowStates(sal_Int32 nDBRow,sal_Int32 aState); + sal_Int32 getRowStates(sal_Int32 nDBRow); + sal_Bool setRowStates(sal_Int32 nDBRow,sal_Int32 aState); bool hadError() const { return m_aError.is(); } inline const ErrorDescriptor& getError() const { return m_aError; } public: -// MQuery(); +// MQuery(); MQuery( const OColumnAlias& _ca ); virtual ~MQuery(); static MNameMapper* CreateNameMapper(); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index b7b1f2bbc7f9..a6b9cbff8f83 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.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 @@ -173,7 +173,7 @@ sal_Bool MQueryHelper::waitForResultOrComplete( ) { TimeValue timeValue = { 1, 0 }; // 20 Seconds 0 NanoSecond timeout - sal_Int32 times=0; + sal_Int32 times=0; osl::Condition::Result rv = ::osl::Condition::result_ok; OSL_TRACE("In : waitForResultOrComplete()"); @@ -449,10 +449,10 @@ const char * getAddrURI(const nsIAbDirectory* directory) } #define ENSURE_GETUPDATECARD(x) \ - if (NS_FAILED(retCode)) \ - { \ - OSL_TRACE( x ); \ - return card; \ + if (NS_FAILED(retCode)) \ + { \ + OSL_TRACE( x ); \ + return card; \ } static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -483,11 +483,11 @@ nsIAbCard * getUpdatedCard( nsIAbCard* card) return aNewCard; } -#define ENSURE_MOZAB_PROFILE_NOT_LOOKED(directory) \ - if (getDirectoryType(directory) == SDBCAddress::Mozilla && isProfileLocked(NULL)) \ - { \ +#define ENSURE_MOZAB_PROFILE_NOT_LOOKED(directory) \ + if (getDirectoryType(directory) == SDBCAddress::Mozilla && isProfileLocked(NULL)) \ + { \ m_aError.setResId( STR_MOZILLA_IS_RUNNIG_NO_CHANGES ); \ - return sal_False; \ + return sal_False; \ } sal_Int32 MQueryHelper::commitCard(const sal_Int32 rowIndex,nsIAbDirectory * directory) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index 3daedc286d04..1da8f15464eb 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.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 @@ -52,7 +52,7 @@ namespace connectivity mutable ::osl::Mutex m_aMutex; FieldMap m_Fields; nsCOMPtr<nsIAbCard> m_Card; - sal_Int32 m_RowStates; + sal_Int32 m_RowStates; public: MQueryHelperResultEntry(); @@ -129,13 +129,13 @@ namespace connectivity sal_Int32 getResultCount() const; sal_uInt32 getRealCount() const; - sal_Int32 createNewCard(); //return Row count number - sal_Bool resyncRow(sal_Int32 rowIndex); + sal_Int32 createNewCard(); //return Row count number + sal_Bool resyncRow(sal_Int32 rowIndex); void notifyQueryError() ; - sal_Bool setCardValues(const sal_Int32 rowIndex); - sal_Int32 commitCard(const sal_Int32 rowIndex, nsIAbDirectory * directory); - sal_Int32 deleteCard(const sal_Int32 rowIndex, nsIAbDirectory * directory); + sal_Bool setCardValues(const sal_Int32 rowIndex); + sal_Int32 commitCard(const sal_Int32 rowIndex, nsIAbDirectory * directory); + sal_Int32 deleteCard(const sal_Int32 rowIndex, nsIAbDirectory * directory); }; } } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx index 66f3c5fabba5..6e4d75831a56 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.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 @@ -43,7 +43,7 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns const char *cs = os.getStr(); PRUint32 csLen = os.getLength(); - + NS_ConvertUTF8toUCS2 mozString(cs, csLen); //const PRUnichar* uniMozString = (const PRUnichar*) mozString; nss = mozString; // temp. diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx index df903eaa003f..55c1246d4313 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.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 @@ -33,7 +33,7 @@ #include <rtl/ustring.hxx> #include<string> - + namespace connectivity { namespace mozab diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h index a63db2b480c8..cf365e1008cc 100644 --- a/connectivity/source/drivers/mozab/post_include_mozilla.h +++ b/connectivity/source/drivers/mozab/post_include_mozilla.h @@ -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/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h index a90c6a394fd8..4da60543cb50 100644 --- a/connectivity/source/drivers/mozab/pre_include_mozilla.h +++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h @@ -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/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index 090d0b5486d0..3aeff3344ad1 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.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 @@ -72,8 +72,8 @@ void OMySQLCatalog::refreshTables() Sequence< ::rtl::OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; - sTableTypes[2] = s_sAll; // just to be sure to include anything else .... - + sTableTypes[2] = s_sAll; // just to be sure to include anything else .... + refreshObjects(sTableTypes,aVector); if ( m_pTables ) @@ -157,7 +157,7 @@ Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) throw(RuntimeException) { Sequence< Type > aTypes = OCatalog::getTypes(); ::std::vector<Type> aOwnTypes; - aOwnTypes.reserve(aTypes.getLength()); + aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx index 25ed7d7a9c20..28c9861f615b 100644 --- a/connectivity/source/drivers/mysql/YColumns.cxx +++ b/connectivity/source/drivers/mysql/YColumns.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 @@ -43,7 +43,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OMySQLColumns::OMySQLColumns( ::cppu::OWeakObject& _rParent +OMySQLColumns::OMySQLColumns( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -58,8 +58,8 @@ Reference< XPropertySet > OMySQLColumns::createDescriptor() } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -OMySQLColumn::OMySQLColumn( sal_Bool _bCase) - : connectivity::sdbcx::OColumn( _bCase ) +OMySQLColumn::OMySQLColumn( sal_Bool _bCase) + : connectivity::sdbcx::OColumn( _bCase ) { construct(); } @@ -67,17 +67,17 @@ OMySQLColumn::OMySQLColumn( sal_Bool _bCase) void OMySQLColumn::construct() { m_sAutoIncrement = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("auto_increment")); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OMySQLColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const -{ +{ return doCreateArrayHelper(); } // ----------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper & SAL_CALL OMySQLColumn::getInfoHelper() -{ - return *OMySQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); +::cppu::IPropertyArrayHelper & SAL_CALL OMySQLColumn::getInfoHelper() +{ + return *OMySQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } // ----------------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException) diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index dc96adba44ff..4e60c0f01519 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.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 @@ -63,7 +63,7 @@ namespace connectivity //= ODriverDelegator //==================================================================== //-------------------------------------------------------------------- - ODriverDelegator::ODriverDelegator(const Reference< XMultiServiceFactory >& _rxFactory) + ODriverDelegator::ODriverDelegator(const Reference< XMultiServiceFactory >& _rxFactory) : ODriverDelegator_BASE(m_aMutex) ,m_xFactory(_rxFactory) ,m_eDriverType(D_ODBC) @@ -91,7 +91,7 @@ namespace connectivity void ODriverDelegator::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - + for (TWeakPairVector::iterator i = m_aConnections.begin(); m_aConnections.end() != i; ++i) { @@ -104,7 +104,7 @@ namespace connectivity ODriverDelegator_BASE::disposing(); } - namespace + namespace { sal_Bool isOdbcUrl(const ::rtl::OUString& _sUrl) { @@ -212,7 +212,7 @@ namespace connectivity ,makeAny(sal_True) ,PropertyState_DIRECT_VALUE) ); PropertyValue* pProps = aProps.empty() ? 0 : &aProps[0]; - return Sequence< PropertyValue >(pProps, aProps.size()); + return Sequence< PropertyValue >(pProps, aProps.size()); } } //-------------------------------------------------------------------- @@ -233,7 +233,7 @@ namespace connectivity m_xNativeDriver = lcl_loadDriver(m_xFactory,sCuttedUrl); xDriver = m_xNativeDriver; } - else + else { ::comphelper::NamedValueCollection aSettings( info ); ::rtl::OUString sDriverClass(RTL_CONSTASCII_USTRINGPARAM("com.mysql.jdbc.Driver")); @@ -304,7 +304,7 @@ namespace connectivity pMetaConnection->setURL(url); } m_aConnections.push_back(TWeakPair(WeakReferenceHelper(xConnection),TWeakConnectionPair(WeakReferenceHelper(),pMetaConnection))); - } + } } } return xConnection; @@ -334,7 +334,7 @@ namespace connectivity aBoolean[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")); aBoolean[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")); - + aDriverInfo.push_back(DriverPropertyInfo( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet")) ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet of the database.")) @@ -361,7 +361,7 @@ namespace connectivity ); } - return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); + return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } //-------------------------------------------------------------------- @@ -375,7 +375,7 @@ namespace connectivity { return 0; } - + //-------------------------------------------------------------------- Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException) { @@ -425,7 +425,7 @@ namespace connectivity } return xTab; } - + //-------------------------------------------------------------------- Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { @@ -438,7 +438,7 @@ namespace connectivity return getDataDefinitionByConnection(connect(url,info)); } - + // XServiceInfo // -------------------------------------------------------------------------------- //------------------------------------------------------------------------------ @@ -478,7 +478,7 @@ namespace connectivity } //------------------------------------------------------------------ //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index f40a348db09e..e08b488df633 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.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 @@ -74,7 +74,7 @@ namespace connectivity return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DROP FOREIGN KEY ")); } public: - OMySQLKeysHelper( OTableHelper* _pTable, + OMySQLKeysHelper( OTableHelper* _pTable, ::osl::Mutex& _rMutex, const TStringVector& _rVector ) : OKeysHelper(_pTable,_rMutex,_rVector){} @@ -83,24 +83,24 @@ namespace connectivity } } -OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, - const Reference< XConnection >& _xConnection) +OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, + const Reference< XConnection >& _xConnection) :OTableHelper(_pTables,_xConnection,sal_True) { // we create a new table here, so we should have all the rights or ;-) - m_nPrivileges = Privilege::DROP | - Privilege::REFERENCE | - Privilege::ALTER | - Privilege::CREATE | - Privilege::READ | - Privilege::DELETE | - Privilege::UPDATE | - Privilege::INSERT | + m_nPrivileges = Privilege::DROP | + Privilege::REFERENCE | + Privilege::ALTER | + Privilege::CREATE | + Privilege::READ | + Privilege::DELETE | + Privilege::UPDATE | + Privilege::INSERT | Privilege::SELECT; construct(); } // ------------------------------------------------------------------------- -OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, +OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, @@ -108,7 +108,7 @@ OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, const ::rtl::OUString& _SchemaName, const ::rtl::OUString& _CatalogName, sal_Int32 _nPrivileges - ) : OTableHelper( _pTables, + ) : OTableHelper( _pTables, _xConnection, sal_True, _Name, @@ -125,7 +125,7 @@ void OMySQLTable::construct() { OTableHelper::construct(); if ( !isNew() ) - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OMySQLTable::createArrayHelper( sal_Int32 /*_nId*/ ) const @@ -204,32 +204,32 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co sal_Int32 nOldType = 0,nNewType = 0,nOldPrec = 0,nNewPrec = 0,nOldScale = 0,nNewScale = 0; ::dbtools::OPropertyMap& rProp = OMetaConnection::getPropMap(); - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType; // and precsions and scale - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nOldPrec; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nOldPrec; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_PRECISION))>>= nNewPrec; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nOldScale; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nNewScale; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nOldScale; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nNewScale; // second: check the "is nullable" value sal_Int32 nOldNullable = 0,nNewNullable = 0; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nOldNullable; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nOldNullable; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable; // check also the auto_increment sal_Bool bOldAutoIncrement = sal_False,bAutoIncrement = sal_False; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bOldAutoIncrement; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bOldAutoIncrement; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; bool bColumnNameChanged = false; ::rtl::OUString sOldDesc,sNewDesc; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sOldDesc; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sNewDesc; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sOldDesc; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sNewDesc; - if ( nOldType != nNewType - || nOldPrec != nNewPrec - || nOldScale != nNewScale - || nNewNullable != nOldNullable - || bOldAutoIncrement != bAutoIncrement + if ( nOldType != nNewType + || nOldPrec != nNewPrec + || nOldScale != nNewScale + || nNewNullable != nOldNullable + || bOldAutoIncrement != bAutoIncrement || sOldDesc != sNewDesc ) { // special handling because they change dthe type names to distinguish @@ -264,7 +264,7 @@ void SAL_CALL OMySQLTable::alterColumnByName( const ::rtl::OUString& colName, co // third: check the default values ::rtl::OUString sNewDefault,sOldDefault; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault; if(sOldDefault.getLength()) diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index 7248e3a7327d..28858834e10c 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.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 @@ -70,7 +70,7 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) Sequence< ::rtl::OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; - sTableTypes[2] = s_sAll; // just to be sure to include anything else .... + sTableTypes[2] = s_sAll; // just to be sure to include anything else .... Any aCatalog; if ( sCatalog.getLength() ) @@ -83,26 +83,26 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) Reference< XRow > xRow(xResult,UNO_QUERY); if ( xResult->next() ) // there can be only one table with this name { -// Reference<XStatement> xStmt = m_xConnection->createStatement(); -// if ( xStmt.is() ) -// { -// Reference< XResultSet > xPrivRes = xStmt->executeQuery(); -// Reference< XRow > xPrivRow(xPrivRes,UNO_QUERY); -// while ( xPrivRes.is() && xPrivRes->next() ) -// { -// if ( xPrivRow->getString(1) ) -// { -// } -// } -// } - sal_Int32 nPrivileges = Privilege::DROP | - Privilege::REFERENCE | - Privilege::ALTER | - Privilege::CREATE | - Privilege::READ | - Privilege::DELETE | - Privilege::UPDATE | - Privilege::INSERT | +// Reference<XStatement> xStmt = m_xConnection->createStatement(); +// if ( xStmt.is() ) +// { +// Reference< XResultSet > xPrivRes = xStmt->executeQuery(); +// Reference< XRow > xPrivRow(xPrivRes,UNO_QUERY); +// while ( xPrivRes.is() && xPrivRes->next() ) +// { +// if ( xPrivRow->getString(1) ) +// { +// } +// } +// } + sal_Int32 nPrivileges = Privilege::DROP | + Privilege::REFERENCE | + Privilege::ALTER | + Privilege::CREATE | + Privilege::READ | + Privilege::DELETE | + Privilege::UPDATE | + Privilege::INSERT | Privilege::SELECT; OMySQLTable* pRet = new OMySQLTable( this @@ -234,7 +234,7 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable) void OTables::addComment(const Reference< XPropertySet >& descriptor,::rtl::OUStringBuffer& _rOut) { ::rtl::OUString sDesc; - descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sDesc; + descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)) >>= sDesc; if ( sDesc.getLength() ) { _rOut.appendAscii(" COMMENT '"); diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index 0cdd1bf5e8c4..2467c9c7b4ad 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.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 @@ -47,7 +47,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True) +OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True) ,m_xConnection(_xConnection) { construct(); @@ -65,15 +65,15 @@ void OMySQLUser::refreshGroups() { } // ------------------------------------------------------------------------- -OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OMySQLUser(_xConnection) +OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OMySQLUser(_xConnection) { construct(); } // ------------------------------------------------------------------------- -typedef connectivity::sdbcx::OUser OUser_TYPEDEF; +typedef connectivity::sdbcx::OUser OUser_TYPEDEF; void OUserExtend::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } // ----------------------------------------------------------------------------- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const @@ -118,7 +118,7 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName xRes = xMeta->getTablePrivileges(aCatalog,sSchema,sTable); } break; - + case PrivilegeObject::COLUMN: { Any aCatalog; @@ -128,29 +128,29 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName } break; } - + if ( xRes.is() ) { - static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); - static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); - static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); - static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); - static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); - static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); - static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); + static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); + static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); + static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); + static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); + static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); + static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); + static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); static const ::rtl::OUString sREFERENCE = ::rtl::OUString::createFromAscii("REFERENCE"); - static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); - static const ::rtl::OUString sYes = ::rtl::OUString::createFromAscii("YES"); + static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); + static const ::rtl::OUString sYes = ::rtl::OUString::createFromAscii("YES"); nRightsWithGrant = nRights = 0; Reference<XRow> xCurrentRow(xRes,UNO_QUERY); while( xCurrentRow.is() && xRes->next() ) { - ::rtl::OUString sGrantee = xCurrentRow->getString(5); - ::rtl::OUString sPrivilege = xCurrentRow->getString(6); - ::rtl::OUString sGrantable = xCurrentRow->getString(7); - + ::rtl::OUString sGrantee = xCurrentRow->getString(5); + ::rtl::OUString sPrivilege = xCurrentRow->getString(6); + ::rtl::OUString sGrantable = xCurrentRow->getString(7); + if (!m_Name.equalsIgnoreAsciiCase(sGrantee)) continue; @@ -217,7 +217,7 @@ sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const ::rtl::OUString& ob { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); - + sal_Int32 nRights,nRightsWithGrant; findPrivilegesAndGrantPrivileges(objName,objType,nRights,nRightsWithGrant); return nRightsWithGrant; @@ -245,7 +245,7 @@ void SAL_CALL OMySQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_I sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); sGrant += ::rtl::OUString::createFromAscii(" TO "); sGrant += m_Name; - + Reference<XStatement> xStmt = m_xConnection->createStatement(); if(xStmt.is()) xStmt->execute(sGrant); @@ -275,7 +275,7 @@ void SAL_CALL OMySQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_ sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); sGrant += ::rtl::OUString::createFromAscii(" FROM "); sGrant += m_Name; - + Reference<XStatement> xStmt = m_xConnection->createStatement(); if(xStmt.is()) xStmt->execute(sGrant); @@ -295,7 +295,7 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/ sAlterPwd += newPassword; sAlterPwd += ::rtl::OUString::createFromAscii("')") ; - + Reference<XStatement> xStmt = m_xConnection->createStatement(); if ( xStmt.is() ) { @@ -309,35 +309,35 @@ void SAL_CALL OMySQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/ ::rtl::OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) sPrivs += ::rtl::OUString::createFromAscii("INSERT"); - + if((nRights & Privilege::DELETE) == Privilege::DELETE) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("DELETE"); } - + if((nRights & Privilege::UPDATE) == Privilege::UPDATE) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("UPDATE"); } - + if((nRights & Privilege::ALTER) == Privilege::ALTER) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("ALTER"); } - + if((nRights & Privilege::SELECT) == Privilege::SELECT) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("SELECT"); } - + if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE) { if(sPrivs.getLength()) diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index da6e024fef62..6f69b59e8bb5 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.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 @@ -44,7 +44,7 @@ using namespace connectivity; using namespace connectivity::mysql; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -54,7 +54,7 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - connectivity::sdbcx::IRefreshableUsers* _pParent) + connectivity::sdbcx::IRefreshableUsers* _pParent) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector) ,m_xConnection(_xConnection) ,m_pParent(_pParent) @@ -81,8 +81,8 @@ Reference< XPropertySet > OUsers::createDescriptor() // XAppend sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("GRANT USAGE ON * TO "); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("GRANT USAGE ON * TO "); + ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sUserName( _rForName ); aSql += ::dbtools::quoteName(aQuote,sUserName) + ::rtl::OUString::createFromAscii(" @\"%\" "); @@ -106,8 +106,8 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const // XDrop void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("REVOKE ALL ON * FROM "); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("REVOKE ALL ON * FROM "); + ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); aSql += ::dbtools::quoteName(aQuote,_sElementName); Reference< XStatement > xStmt = m_xConnection->createStatement( ); diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx index 767ae19cdb48..5d3226577fa8 100644 --- a/connectivity/source/drivers/mysql/YViews.cxx +++ b/connectivity/source/drivers/mysql/YViews.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 @@ -64,8 +64,8 @@ sdbcx::ObjectType OViews::createObject(const ::rtl::OUString& _rName) ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); return new ::connectivity::sdbcx::OView(isCaseSensitive(), @@ -114,10 +114,10 @@ void OViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) if (!bIsNew) { ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW"); - + Reference<XPropertySet> xProp(xObject,UNO_QUERY); aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true ); - + Reference<XConnection> xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection(); Reference< XStatement > xStmt = xConnection->createStatement( ); xStmt->execute(aSql); @@ -136,8 +136,8 @@ void OViews::createView( const Reference< XPropertySet >& descriptor ) { Reference<XConnection> xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection(); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW "); - ::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW "); + ::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sSchema,sCommand; aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx index 391acae12ed5..e3987d90c5ba 100644 --- a/connectivity/source/drivers/mysql/Yservices.cxx +++ b/connectivity/source/drivers/mysql/Yservices.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 @@ -116,8 +116,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/mysql/mysql.xcu b/connectivity/source/drivers/mysql/mysql.xcu index afc5c0d07f5d..16e3c8203183 100755 --- a/connectivity/source/drivers/mysql/mysql.xcu +++ b/connectivity/source/drivers/mysql/mysql.xcu @@ -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/source/drivers/mysql/mysql.xml b/connectivity/source/drivers/mysql/mysql.xml index 6ef9f55721b1..93cb83d0ab15 100644 --- a/connectivity/source/drivers/mysql/mysql.xml +++ b/connectivity/source/drivers/mysql/mysql.xml @@ -13,7 +13,7 @@ <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> <supported-service>com.sun.star.sdbcx.Driver</supported-service> - </component-description> + </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>sal</project-build-dependency> diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index fd4183b2c14b..66e10db75de1 100644 --- a/connectivity/source/drivers/odbc/OFunctions.cxx +++ b/connectivity/source/drivers/odbc/OFunctions.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 @@ -42,7 +42,7 @@ T3SQLConnect pODBC3SQLConnect; T3SQLDriverConnect pODBC3SQLDriverConnect; T3SQLBrowseConnect pODBC3SQLBrowseConnect; T3SQLDataSources pODBC3SQLDataSources; -T3SQLDrivers pODBC3SQLDrivers; +T3SQLDrivers pODBC3SQLDrivers; T3SQLGetInfo pODBC3SQLGetInfo; T3SQLGetFunctions pODBC3SQLGetFunctions; T3SQLGetTypeInfo pODBC3SQLGetTypeInfo; @@ -86,7 +86,7 @@ T3SQLForeignKeys pODBC3SQLForeignKeys; T3SQLPrimaryKeys pODBC3SQLPrimaryKeys; T3SQLProcedureColumns pODBC3SQLProcedureColumns; T3SQLProcedures pODBC3SQLProcedures; -T3SQLSpecialColumns pODBC3SQLSpecialColumns; +T3SQLSpecialColumns pODBC3SQLSpecialColumns; T3SQLStatistics pODBC3SQLStatistics; T3SQLTablePrivileges pODBC3SQLTablePrivileges; T3SQLTables pODBC3SQLTables; @@ -107,12 +107,12 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) { static sal_Bool bLoaded = sal_False; static oslModule pODBCso = NULL; - - if (bLoaded) + + if (bLoaded) return sal_True; #ifdef WIN _rPath = ::rtl::OUString::createFromAscii("ODBC.DLL"); - + #endif #ifdef WNT _rPath = ::rtl::OUString::createFromAscii("ODBC32.DLL"); @@ -153,127 +153,127 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath) sal_Bool LoadFunctions(oslModule pODBCso) { - if( ( pODBC3SQLAllocHandle = (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLAllocHandle").pData )) == NULL ) + if( ( pODBC3SQLAllocHandle = (T3SQLAllocHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLAllocHandle").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLConnect = (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLConnect").pData )) == NULL ) + if( ( pODBC3SQLConnect = (T3SQLConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLConnect").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDriverConnect = (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDriverConnect").pData )) == NULL ) + if( ( pODBC3SQLDriverConnect = (T3SQLDriverConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDriverConnect").pData )) == NULL ) return sal_False; if( ( pODBC3SQLBrowseConnect = (T3SQLBrowseConnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBrowseConnect").pData )) == NULL ) return sal_False; - if(( pODBC3SQLDataSources = (T3SQLDataSources)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDataSources").pData )) == NULL ) + if(( pODBC3SQLDataSources = (T3SQLDataSources)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDataSources").pData )) == NULL ) return sal_False; - if(( pODBC3SQLDrivers = (T3SQLDrivers)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDrivers").pData )) == NULL ) + if(( pODBC3SQLDrivers = (T3SQLDrivers)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDrivers").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetInfo = (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetInfo").pData )) == NULL ) + if( ( pODBC3SQLGetInfo = (T3SQLGetInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetInfo").pData )) == NULL ) return sal_False; - if(( pODBC3SQLGetFunctions = (T3SQLGetFunctions)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetFunctions").pData )) == NULL ) + if(( pODBC3SQLGetFunctions = (T3SQLGetFunctions)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetFunctions").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetTypeInfo = (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetTypeInfo").pData )) == NULL ) + if( ( pODBC3SQLGetTypeInfo = (T3SQLGetTypeInfo)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetTypeInfo").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetConnectAttr = (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetConnectAttr").pData )) == NULL ) + if( ( pODBC3SQLSetConnectAttr = (T3SQLSetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetConnectAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetConnectAttr = (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetConnectAttr").pData )) == NULL ) + if( ( pODBC3SQLGetConnectAttr = (T3SQLGetConnectAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetConnectAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetEnvAttr = (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetEnvAttr").pData )) == NULL ) + if( ( pODBC3SQLSetEnvAttr = (T3SQLSetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetEnvAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetEnvAttr = (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetEnvAttr").pData )) == NULL ) + if( ( pODBC3SQLGetEnvAttr = (T3SQLGetEnvAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetEnvAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetStmtAttr = (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetStmtAttr").pData )) == NULL ) + if( ( pODBC3SQLSetStmtAttr = (T3SQLSetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetStmtAttr").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetStmtAttr = (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetStmtAttr").pData )) == NULL ) + if( ( pODBC3SQLGetStmtAttr = (T3SQLGetStmtAttr)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetStmtAttr").pData )) == NULL ) return sal_False; - /*if( ( pODBC3SQLSetDescField = (T3SQLSetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescField").pData )) == NULL ) + /*if( ( pODBC3SQLSetDescField = (T3SQLSetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescField").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetDescField = (T3SQLGetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescField").pData )) == NULL ) + if( ( pODBC3SQLGetDescField = (T3SQLGetDescField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescField").pData )) == NULL ) return sal_False;*/ - /*if( ( pODBC3SQLGetDescRec = (T3SQLGetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescRec").pData )) == NULL ) + /*if( ( pODBC3SQLGetDescRec = (T3SQLGetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDescRec").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetDescRec = (T3SQLSetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescRec").pData )) == NULL ) + if( ( pODBC3SQLSetDescRec = (T3SQLSetDescRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetDescRec").pData )) == NULL ) return sal_False;*/ - if( ( pODBC3SQLPrepare = (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrepare").pData )) == NULL ) + if( ( pODBC3SQLPrepare = (T3SQLPrepare)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrepare").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLBindParameter = (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindParameter").pData )) == NULL ) + if( ( pODBC3SQLBindParameter = (T3SQLBindParameter)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindParameter").pData )) == NULL ) return sal_False; -// if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL ) -// return sal_False; - if( ( pODBC3SQLSetCursorName = (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetCursorName").pData )) == NULL ) +// if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL ) +// return sal_False; + if( ( pODBC3SQLSetCursorName = (T3SQLSetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetCursorName").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLExecute = (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecute").pData )) == NULL ) + if( ( pODBC3SQLExecute = (T3SQLExecute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecute").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLExecDirect = (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecDirect").pData )) == NULL ) + if( ( pODBC3SQLExecDirect = (T3SQLExecDirect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLExecDirect").pData )) == NULL ) return sal_False; - /*if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL ) + /*if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL ) return sal_False;*/ if( ( pODBC3SQLDescribeParam = (T3SQLDescribeParam)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeParam").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLNumParams = (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumParams").pData )) == NULL ) + if( ( pODBC3SQLNumParams = (T3SQLNumParams)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumParams").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLParamData = (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLParamData").pData )) == NULL ) + if( ( pODBC3SQLParamData = (T3SQLParamData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLParamData").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLPutData = (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPutData").pData )) == NULL ) + if( ( pODBC3SQLPutData = (T3SQLPutData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPutData").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLRowCount = (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLRowCount").pData )) == NULL ) + if( ( pODBC3SQLRowCount = (T3SQLRowCount)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLRowCount").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLNumResultCols = (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumResultCols").pData )) == NULL ) + if( ( pODBC3SQLNumResultCols = (T3SQLNumResultCols)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNumResultCols").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDescribeCol = (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeCol").pData )) == NULL ) + if( ( pODBC3SQLDescribeCol = (T3SQLDescribeCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDescribeCol").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLColAttribute = (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColAttribute").pData )) == NULL ) + if( ( pODBC3SQLColAttribute = (T3SQLColAttribute)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColAttribute").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLBindCol = (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindCol").pData )) == NULL ) + if( ( pODBC3SQLBindCol = (T3SQLBindCol)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBindCol").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFetch = (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetch").pData )) == NULL ) + if( ( pODBC3SQLFetch = (T3SQLFetch)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetch").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFetchScroll = (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetchScroll").pData )) == NULL ) + if( ( pODBC3SQLFetchScroll = (T3SQLFetchScroll)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFetchScroll").pData )) == NULL ) + return sal_False; + if( ( pODBC3SQLGetData = (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetData").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetData = (T3SQLGetData)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetData").pData )) == NULL ) + if( ( pODBC3SQLSetPos = (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetPos").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLSetPos = (T3SQLSetPos)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSetPos").pData )) == NULL ) + if( ( pODBC3SQLBulkOperations = (T3SQLBulkOperations)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBulkOperations").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLBulkOperations = (T3SQLBulkOperations)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLBulkOperations").pData )) == NULL ) + if( ( pODBC3SQLMoreResults = (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLMoreResults").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLMoreResults = (T3SQLMoreResults)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLMoreResults").pData )) == NULL ) - return sal_False; - /*if( ( pODBC3SQLGetDiagField = (T3SQLGetDiagField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagField").pData )) == NULL ) + /*if( ( pODBC3SQLGetDiagField = (T3SQLGetDiagField)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagField").pData )) == NULL ) return sal_False;*/ - if( ( pODBC3SQLGetDiagRec = (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagRec").pData )) == NULL ) + if( ( pODBC3SQLGetDiagRec = (T3SQLGetDiagRec)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetDiagRec").pData )) == NULL ) return sal_False; if( ( pODBC3SQLColumnPrivileges = (T3SQLColumnPrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumnPrivileges").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLColumns = (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumns").pData )) == NULL ) + if( ( pODBC3SQLColumns = (T3SQLColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLColumns").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLForeignKeys = (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLForeignKeys").pData )) == NULL ) + if( ( pODBC3SQLForeignKeys = (T3SQLForeignKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLForeignKeys").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLPrimaryKeys = (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrimaryKeys").pData )) == NULL ) + if( ( pODBC3SQLPrimaryKeys = (T3SQLPrimaryKeys)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLPrimaryKeys").pData )) == NULL ) return sal_False; if( ( pODBC3SQLProcedureColumns = (T3SQLProcedureColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedureColumns").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLProcedures = (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedures").pData )) == NULL ) + if( ( pODBC3SQLProcedures = (T3SQLProcedures)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLProcedures").pData )) == NULL ) return sal_False; if( ( pODBC3SQLSpecialColumns = (T3SQLSpecialColumns)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLSpecialColumns").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLStatistics = (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLStatistics").pData )) == NULL ) - return sal_False; - if( ( pODBC3SQLTablePrivileges = (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTablePrivileges").pData )) == NULL ) + if( ( pODBC3SQLStatistics = (T3SQLStatistics)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLStatistics").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLTables = (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTables").pData )) == NULL ) + if( ( pODBC3SQLTablePrivileges = (T3SQLTablePrivileges)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTablePrivileges").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFreeStmt = (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeStmt").pData )) == NULL ) + if( ( pODBC3SQLTables = (T3SQLTables)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLTables").pData )) == NULL ) + return sal_False; + if( ( pODBC3SQLFreeStmt = (T3SQLFreeStmt)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeStmt").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLCloseCursor = (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCloseCursor").pData )) == NULL ) + if( ( pODBC3SQLCloseCursor = (T3SQLCloseCursor)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCloseCursor").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLCancel = (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCancel").pData )) == NULL ) + if( ( pODBC3SQLCancel = (T3SQLCancel)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLCancel").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLEndTran = (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLEndTran").pData )) == NULL ) + if( ( pODBC3SQLEndTran = (T3SQLEndTran)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLEndTran").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLDisconnect = (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDisconnect").pData )) == NULL ) + if( ( pODBC3SQLDisconnect = (T3SQLDisconnect)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLDisconnect").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLFreeHandle = (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeHandle").pData )) == NULL ) + if( ( pODBC3SQLFreeHandle = (T3SQLFreeHandle)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLFreeHandle").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL ) + if( ( pODBC3SQLGetCursorName = (T3SQLGetCursorName)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLGetCursorName").pData )) == NULL ) return sal_False; - if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL ) + if( ( pODBC3SQLNativeSql = (T3SQLNativeSql)osl_getFunctionSymbol(pODBCso, ::rtl::OUString::createFromAscii("SQLNativeSql").pData )) == NULL ) return sal_False; return sal_True; diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index 1bca9cccc78a..8dd9ab3bfd25 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.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 @@ -108,7 +108,7 @@ namespace connectivity { protected: virtual oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const; - virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath); + virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath); public: ORealObdcDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {} }; diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx index 41185499aa15..9b1939335ae1 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.hxx +++ b/connectivity/source/drivers/odbc/ORealDriver.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/source/drivers/odbc/odbc.xcu b/connectivity/source/drivers/odbc/odbc.xcu index 74ba8815d021..f8efe2eed493 100755 --- a/connectivity/source/drivers/odbc/odbc.xcu +++ b/connectivity/source/drivers/odbc/odbc.xcu @@ -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/source/drivers/odbc/odbc.xml b/connectivity/source/drivers/odbc/odbc.xml index ad7562ae7a35..eae2d3f3e11a 100644 --- a/connectivity/source/drivers/odbc/odbc.xml +++ b/connectivity/source/drivers/odbc/odbc.xml @@ -12,7 +12,7 @@ <language>c++</language> <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> - </component-description> + </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>sal</project-build-dependency> diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index 34e29b5cbcc2..eab3c07f3076 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.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 @@ -117,8 +117,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx index d7bd5c6baef5..1fec1f89ec38 100644 --- a/connectivity/source/drivers/odbcbase/OConnection.cxx +++ b/connectivity/source/drivers/odbcbase/OConnection.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 @@ -56,7 +56,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; // -------------------------------------------------------------------------------- -OConnection::OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver) +OConnection::OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver) : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) ,m_pDriver(_pDriver) ,m_pDriverHandleCopy(_pDriverHandle) @@ -161,7 +161,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int { ::rtl::OUString sVersion; OTools::GetInfo(this,m_aConnectionHandle,SQL_DRIVER_ODBC_VER,sVersion,*this,getTextEncoding()); - m_bUseOldDateFormat = sVersion == ::rtl::OUString::createFromAscii("02.50") || sVersion == ::rtl::OUString::createFromAscii("02.00"); + m_bUseOldDateFormat = sVersion == ::rtl::OUString::createFromAscii("02.50") || sVersion == ::rtl::OUString::createFromAscii("02.00"); } catch(Exception&) { @@ -179,7 +179,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { m_aConnectionHandle = SQL_NULL_HANDLE; - m_sURL = url; + m_sURL = url; setConnectionInfo(info); // Connection allozieren @@ -192,23 +192,23 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop ::rtl::OUString aDSN(RTL_CONSTASCII_USTRINGPARAM("DSN=")), aUID, aPWD, aSysDrvSettings; aDSN += url.copy(nLen+1); - const char* pUser = "user"; - const char* pTimeout = "Timeout"; - const char* pSilent = "Silent"; - const char* pPwd = "password"; + const char* pUser = "user"; + const char* pTimeout = "Timeout"; + const char* pSilent = "Silent"; + const char* pPwd = "password"; const char* pUseCatalog = "UseCatalog"; - const char* pSysDrv = "SystemDriverSettings"; - const char* pCharSet = "CharSet"; - const char* pParaName = "ParameterNameSubstitution"; - const char* pPrivName = "IgnoreDriverPrivileges"; + const char* pSysDrv = "SystemDriverSettings"; + const char* pCharSet = "CharSet"; + const char* pParaName = "ParameterNameSubstitution"; + const char* pPrivName = "IgnoreDriverPrivileges"; const char* pVerColName = "PreventGetVersionColumns"; // #i60273# - const char* pRetrieving = "IsAutoRetrievingEnabled"; - const char* pRetriStmt = "AutoRetrievingStatement"; + const char* pRetrieving = "IsAutoRetrievingEnabled"; + const char* pRetriStmt = "AutoRetrievingStatement"; sal_Int32 nTimeout = 20; sal_Bool bSilent = sal_True; - const PropertyValue *pBegin = info.getConstArray(); - const PropertyValue *pEnd = pBegin + info.getLength(); + const PropertyValue *pBegin = info.getConstArray(); + const PropertyValue *pEnd = pBegin + info.getLength(); for(;pBegin != pEnd;++pBegin) { if(!pBegin->Name.compareToAscii(pTimeout)) @@ -497,13 +497,13 @@ void OConnection::buildTypeInfo() throw( SQLException) { Reference< XRow> xRow(xRs,UNO_QUERY); // Information for a single SQL type - + ::connectivity::ORowSetValue aValue; ::std::vector<sal_Int32> aTypes; Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData(); sal_Int32 nCount = xResultSetMetaData->getColumnCount(); // Loop on the result set until we reach end of file - while (xRs->next ()) + while (xRs->next ()) { OTypeInfo aInfo; sal_Int32 nPos = 1; @@ -518,54 +518,54 @@ void OConnection::buildTypeInfo() throw( SQLException) } aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aTypeName = aValue; + aInfo.aTypeName = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nType = aValue; + aInfo.nType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nPrecision = aValue; + aInfo.nPrecision = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aLiteralPrefix = aValue; + aInfo.aLiteralPrefix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aLiteralSuffix = aValue; + aInfo.aLiteralSuffix = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aCreateParams = aValue; + aInfo.aCreateParams = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; + aInfo.bNullable = (sal_Int32)aValue == ColumnValue::NULLABLE; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bCaseSensitive = (sal_Bool)aValue; + aInfo.bCaseSensitive = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nSearchType = aValue; + aInfo.nSearchType = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bUnsigned = (sal_Bool)aValue; + aInfo.bUnsigned = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bCurrency = (sal_Bool)aValue; + aInfo.bCurrency = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.bAutoIncrement = (sal_Bool)aValue; + aInfo.bAutoIncrement = (sal_Bool)aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.aLocalTypeName = aValue; + aInfo.aLocalTypeName = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nMinimumScale = aValue; + aInfo.nMinimumScale = aValue; ++nPos; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nMaximumScale = aValue; + aInfo.nMaximumScale = aValue; if ( nCount >= 18 ) { nPos = 18; aValue.fill(nPos,aTypes[nPos],xRow); - aInfo.nNumPrecRadix = aValue; + aInfo.nNumPrecRadix = aValue; } // check if values are less than zero like it happens in a oracle jdbc driver @@ -606,7 +606,7 @@ void OConnection::disposing() if(!m_bClosed) N3SQLDisconnect(m_aConnectionHandle); - m_bClosed = sal_True; + m_bClosed = sal_True; dispose_ChildImpl(); } diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx index ac0fdc7333f6..ce2b36d9fe2c 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.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 @@ -60,9 +60,9 @@ ODatabaseMetaData::ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon osl_incrementInterlockedCount( &m_refCount ); try { - m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); + m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); ::rtl::OUString sVersion = getDriverVersion(); - m_bOdbc3 = sVersion != ::rtl::OUString::createFromAscii("02.50") && sVersion != ::rtl::OUString::createFromAscii("02.00"); + m_bOdbc3 = sVersion != ::rtl::OUString::createFromAscii("02.50") && sVersion != ::rtl::OUString::createFromAscii("02.00"); } catch(SQLException& ) { // doesn't matter here @@ -335,7 +335,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLExcepti return nValue; } // ------------------------------------------------------------------------- -sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) +sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_TABLES_IN_SELECT,nValue,*this); @@ -483,7 +483,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLExc return nValue == SQL_IC_LOWER; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this); @@ -522,8 +522,8 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ALTER_TABLE,nValue,*this); - return ((nValue & SQL_AT_DROP_COLUMN) == SQL_AT_DROP_COLUMN) || - ((nValue & SQL_AT_DROP_COLUMN_CASCADE) == SQL_AT_DROP_COLUMN_CASCADE) || + return ((nValue & SQL_AT_DROP_COLUMN) == SQL_AT_DROP_COLUMN) || + ((nValue & SQL_AT_DROP_COLUMN_CASCADE) == SQL_AT_DROP_COLUMN_CASCADE) || ((nValue & SQL_AT_DROP_COLUMN_RESTRICT) == SQL_AT_DROP_COLUMN_RESTRICT); } // ------------------------------------------------------------------------- @@ -690,7 +690,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw return (nValue & SQL_SU_INDEX_DEFINITION) == SQL_SU_INDEX_DEFINITION; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) +sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this); @@ -713,7 +713,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) thro return (nValue & SQL_CU_INDEX_DEFINITION) == SQL_CU_INDEX_DEFINITION; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) +sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) { SQLUINTEGER nValue=0; if(m_bUseCatalog) @@ -940,25 +940,25 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONVERT_LONGVARBINARY,nValue,*this); break; case DataType::SQLNULL: - // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); + // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); break; case DataType::OTHER: - // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); + // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); break; case DataType::OBJECT: - // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); + // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); break; case DataType::DISTINCT: - // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); + // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); break; case DataType::STRUCT: - // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); + // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); break; case DataType::ARRAY: - // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); + // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); break; case DataType::REF: - // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); + // OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); break; } sal_Bool bConvert = sal_False; diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx index aef6f67b4801..88fd5133b126 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.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 @@ -84,7 +84,7 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(OConnection* _pConnection m_pConnection->acquire(); m_pRowStatusArray = new SQLUSMALLINT[1]; // the default value osl_decrementInterlockedCount( &m_refCount ); - // allocBuffer(); + // allocBuffer(); } // ------------------------------------------------------------------------- @@ -107,7 +107,7 @@ void ODatabaseMetaDataResultSet::disposing(void) if(m_bFreeHandle) m_pConnection->freeStatementHandle(m_aStatementHandle); - m_aStatement = NULL; + m_aStatement = NULL; m_xMetaData.clear(); m_pConnection->release(); } @@ -135,16 +135,16 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw() // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes()); } // ----------------------------------------------------------------------------- -sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) +sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) { - sal_Int32 map = column; + sal_Int32 map = column; if (!m_aColMapping.empty()) { @@ -228,7 +228,7 @@ sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) t { OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_TINYINT,m_bWasNull,**this,&nVal,sizeof nVal); - ::std::map<sal_Int32, ::connectivity::TInt2IntMap >::iterator aValueRangeIter; + ::std::map<sal_Int32, ::connectivity::TInt2IntMap >::iterator aValueRangeIter; if ( !m_aValueRange.empty() && (aValueRangeIter = m_aValueRange.find(columnIndex)) != m_aValueRange.end()) return sal_Int8((*aValueRangeIter).second[(sal_Int32)nVal]); } @@ -335,7 +335,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) t { OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_LONG,m_bWasNull,**this,&nVal,sizeof nVal); - ::std::map<sal_Int32, ::connectivity::TInt2IntMap >::iterator aValueRangeIter; + ::std::map<sal_Int32, ::connectivity::TInt2IntMap >::iterator aValueRangeIter; if ( !m_aValueRange.empty() && (aValueRangeIter = m_aValueRange.find(columnIndex)) != m_aValueRange.end()) return (*aValueRangeIter).second[(sal_Int32)nVal]; } @@ -410,7 +410,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) { OTools::getValue(m_pConnection,m_aStatementHandle,columnIndex,SQL_C_SHORT,m_bWasNull,**this,&nVal,sizeof nVal); - ::std::map<sal_Int32, ::connectivity::TInt2IntMap >::iterator aValueRangeIter; + ::std::map<sal_Int32, ::connectivity::TInt2IntMap >::iterator aValueRangeIter; if ( !m_aValueRange.empty() && (aValueRangeIter = m_aValueRange.find(columnIndex)) != m_aValueRange.end()) return sal_Int16((*aValueRangeIter).second[(sal_Int32)nVal]); } @@ -669,7 +669,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, Runti ::osl::MutexGuard aGuard( m_aMutex ); - // m_nCurrentFetchState = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_NEXT,0); + // m_nCurrentFetchState = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_NEXT,0); m_nCurrentFetchState = N3SQLFetch(m_aStatementHandle); OTools::ThrowException(m_pConnection,m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this); return m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO; @@ -747,11 +747,11 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const throw(SQLException, R Sequence< com::sun::star::beans::Property > aProps(5); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); - DECL_PROP0(RESULTSETTYPE, sal_Int32); + DECL_PROP0(RESULTSETTYPE, sal_Int32); return new ::cppu::OPropertyArrayHelper(aProps); } @@ -824,37 +824,37 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nH void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeException) { TInt2IntMap aMap; - aMap[SQL_BIT] = DataType::BIT; - aMap[SQL_TINYINT] = DataType::TINYINT; - aMap[SQL_SMALLINT] = DataType::SMALLINT; - aMap[SQL_INTEGER] = DataType::INTEGER; - aMap[SQL_FLOAT] = DataType::FLOAT; - aMap[SQL_REAL] = DataType::REAL; - aMap[SQL_DOUBLE] = DataType::DOUBLE; - aMap[SQL_BIGINT] = DataType::BIGINT; - - aMap[SQL_CHAR] = DataType::CHAR; - aMap[SQL_WCHAR] = DataType::CHAR; - aMap[SQL_VARCHAR] = DataType::VARCHAR; - aMap[SQL_WVARCHAR] = DataType::VARCHAR; - aMap[SQL_LONGVARCHAR] = DataType::LONGVARCHAR; - aMap[SQL_WLONGVARCHAR] = DataType::LONGVARCHAR; - - aMap[SQL_TYPE_DATE] = DataType::DATE; - aMap[SQL_DATE] = DataType::DATE; - aMap[SQL_TYPE_TIME] = DataType::TIME; - aMap[SQL_TIME] = DataType::TIME; - aMap[SQL_TYPE_TIMESTAMP] = DataType::TIMESTAMP; - aMap[SQL_TIMESTAMP] = DataType::TIMESTAMP; - - aMap[SQL_DECIMAL] = DataType::DECIMAL; - aMap[SQL_NUMERIC] = DataType::NUMERIC; - - aMap[SQL_BINARY] = DataType::BINARY; - aMap[SQL_VARBINARY] = DataType::VARBINARY; - aMap[SQL_LONGVARBINARY] = DataType::LONGVARBINARY; - - aMap[SQL_GUID] = DataType::VARBINARY; + aMap[SQL_BIT] = DataType::BIT; + aMap[SQL_TINYINT] = DataType::TINYINT; + aMap[SQL_SMALLINT] = DataType::SMALLINT; + aMap[SQL_INTEGER] = DataType::INTEGER; + aMap[SQL_FLOAT] = DataType::FLOAT; + aMap[SQL_REAL] = DataType::REAL; + aMap[SQL_DOUBLE] = DataType::DOUBLE; + aMap[SQL_BIGINT] = DataType::BIGINT; + + aMap[SQL_CHAR] = DataType::CHAR; + aMap[SQL_WCHAR] = DataType::CHAR; + aMap[SQL_VARCHAR] = DataType::VARCHAR; + aMap[SQL_WVARCHAR] = DataType::VARCHAR; + aMap[SQL_LONGVARCHAR] = DataType::LONGVARCHAR; + aMap[SQL_WLONGVARCHAR] = DataType::LONGVARCHAR; + + aMap[SQL_TYPE_DATE] = DataType::DATE; + aMap[SQL_DATE] = DataType::DATE; + aMap[SQL_TYPE_TIME] = DataType::TIME; + aMap[SQL_TIME] = DataType::TIME; + aMap[SQL_TYPE_TIMESTAMP] = DataType::TIMESTAMP; + aMap[SQL_TIMESTAMP] = DataType::TIMESTAMP; + + aMap[SQL_DECIMAL] = DataType::DECIMAL; + aMap[SQL_NUMERIC] = DataType::NUMERIC; + + aMap[SQL_BINARY] = DataType::BINARY; + aMap[SQL_VARBINARY] = DataType::VARBINARY; + aMap[SQL_LONGVARBINARY] = DataType::LONGVARBINARY; + + aMap[SQL_GUID] = DataType::VARBINARY; m_aValueRange[2] = aMap; @@ -865,7 +865,7 @@ void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeExcep //----------------------------------------------------------------------------- void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, - const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) + const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException) { m_bFreeHandle = sal_True; ::rtl::OString aPKQ,aPKO,aPKN,aCOL; @@ -880,12 +880,12 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const ::rtl::OUS aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, *pPKN = aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding).getStr(); - const char *pCOL = NULL; + const char *pCOL = NULL; const char* pComma = ","; const ::rtl::OUString* pBegin = types.getConstArray(); const ::rtl::OUString* pEnd = pBegin + types.getLength(); @@ -912,7 +912,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const ::rtl::OUS } //----------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeException) { m_bFreeHandle = sal_True; SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle, @@ -964,8 +964,8 @@ void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeExcept checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) +void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, const ::rtl::OUString& schema, + const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) { const ::rtl::OUString *pSchemaPat = NULL; @@ -981,7 +981,7 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, cons aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, *pPKN = aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding).getStr(), *pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr(); @@ -997,8 +997,8 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, cons checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, const ::rtl::OUString& schemaPattern, - const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) +void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, const ::rtl::OUString& schemaPattern, + const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) { const ::rtl::OUString *pSchemaPat = NULL; @@ -1013,7 +1013,7 @@ void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && pSchemaPat->getLength() && pSchemaPat->getLength() ? aPKO.getStr() : NULL, *pPKN = aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding).getStr(), *pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr(); @@ -1027,43 +1027,43 @@ void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this); TInt2IntMap aMap; - aMap[SQL_BIT] = DataType::BIT; - aMap[SQL_TINYINT] = DataType::TINYINT; - aMap[SQL_SMALLINT] = DataType::SMALLINT; - aMap[SQL_INTEGER] = DataType::INTEGER; - aMap[SQL_FLOAT] = DataType::FLOAT; - aMap[SQL_REAL] = DataType::REAL; - aMap[SQL_DOUBLE] = DataType::DOUBLE; - aMap[SQL_BIGINT] = DataType::BIGINT; - - aMap[SQL_CHAR] = DataType::CHAR; - aMap[SQL_WCHAR] = DataType::CHAR; - aMap[SQL_VARCHAR] = DataType::VARCHAR; - aMap[SQL_WVARCHAR] = DataType::VARCHAR; - aMap[SQL_LONGVARCHAR] = DataType::LONGVARCHAR; - aMap[SQL_WLONGVARCHAR] = DataType::LONGVARCHAR; - - aMap[SQL_TYPE_DATE] = DataType::DATE; - aMap[SQL_DATE] = DataType::DATE; - aMap[SQL_TYPE_TIME] = DataType::TIME; - aMap[SQL_TIME] = DataType::TIME; - aMap[SQL_TYPE_TIMESTAMP] = DataType::TIMESTAMP; - aMap[SQL_TIMESTAMP] = DataType::TIMESTAMP; - - aMap[SQL_DECIMAL] = DataType::DECIMAL; - aMap[SQL_NUMERIC] = DataType::NUMERIC; - - aMap[SQL_BINARY] = DataType::BINARY; - aMap[SQL_VARBINARY] = DataType::VARBINARY; - aMap[SQL_LONGVARBINARY] = DataType::LONGVARBINARY; - - aMap[SQL_GUID] = DataType::VARBINARY; + aMap[SQL_BIT] = DataType::BIT; + aMap[SQL_TINYINT] = DataType::TINYINT; + aMap[SQL_SMALLINT] = DataType::SMALLINT; + aMap[SQL_INTEGER] = DataType::INTEGER; + aMap[SQL_FLOAT] = DataType::FLOAT; + aMap[SQL_REAL] = DataType::REAL; + aMap[SQL_DOUBLE] = DataType::DOUBLE; + aMap[SQL_BIGINT] = DataType::BIGINT; + + aMap[SQL_CHAR] = DataType::CHAR; + aMap[SQL_WCHAR] = DataType::CHAR; + aMap[SQL_VARCHAR] = DataType::VARCHAR; + aMap[SQL_WVARCHAR] = DataType::VARCHAR; + aMap[SQL_LONGVARCHAR] = DataType::LONGVARCHAR; + aMap[SQL_WLONGVARCHAR] = DataType::LONGVARCHAR; + + aMap[SQL_TYPE_DATE] = DataType::DATE; + aMap[SQL_DATE] = DataType::DATE; + aMap[SQL_TYPE_TIME] = DataType::TIME; + aMap[SQL_TIME] = DataType::TIME; + aMap[SQL_TYPE_TIMESTAMP] = DataType::TIMESTAMP; + aMap[SQL_TIMESTAMP] = DataType::TIMESTAMP; + + aMap[SQL_DECIMAL] = DataType::DECIMAL; + aMap[SQL_NUMERIC] = DataType::NUMERIC; + + aMap[SQL_BINARY] = DataType::BINARY; + aMap[SQL_VARBINARY] = DataType::VARBINARY; + aMap[SQL_LONGVARBINARY] = DataType::LONGVARBINARY; + + aMap[SQL_GUID] = DataType::VARBINARY; m_aValueRange[5] = aMap; checkColumnCount(); } // ------------------------------------------------------------------------- -void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, const ::rtl::OUString& schemaPattern, +void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern,const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException) { @@ -1079,7 +1079,7 @@ void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, *pPKN = aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding).getStr(), *pCOL = aCOL = ::rtl::OUStringToOString(columnNamePattern,m_nTextEncoding).getStr(); @@ -1112,7 +1112,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const ::rtl: aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, *pPKN = aPKN = ::rtl::OUStringToOString(procedureNamePattern,m_nTextEncoding).getStr(); @@ -1126,7 +1126,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const ::rtl: } // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table,sal_Int32 scope, sal_Bool nullable ) + const ::rtl::OUString& table,sal_Int32 scope, sal_Bool nullable ) throw(SQLException, RuntimeException) { const ::rtl::OUString *pSchemaPat = NULL; @@ -1141,7 +1141,7 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any& aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, *pPKN = aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding).getStr(); @@ -1181,10 +1181,10 @@ void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const ::rt if ( catalog2.hasValue() ) aFKQ = ::rtl::OUStringToOString(comphelper::getString(catalog2),m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = schema && schema->getLength() ? ::rtl::OUStringToOString(*schema,m_nTextEncoding).getStr() : NULL, *pPKN = table ? (aPKN = ::rtl::OUStringToOString(*table,m_nTextEncoding)).getStr(): NULL, - *pFKQ = catalog2.hasValue() && aFKQ.getLength() ? aFKQ.getStr() : NULL, + *pFKQ = catalog2.hasValue() && aFKQ.getLength() ? aFKQ.getStr() : NULL, *pFKO = schema2 && schema2->getLength() ? (aFKO = ::rtl::OUStringToOString(*schema2,m_nTextEncoding)).getStr() : NULL, *pFKN = table2 ? (aFKN = ::rtl::OUStringToOString(*table2,m_nTextEncoding)).getStr() : NULL; @@ -1202,20 +1202,20 @@ void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const ::rt } // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSet::openImportedKeys(const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table) throw(SQLException, RuntimeException) + const ::rtl::OUString& table) throw(SQLException, RuntimeException) { openForeignKeys(Any(),NULL,NULL,catalog,!schema.compareToAscii("%") ? &schema : NULL,&table); } // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSet::openExportedKeys(const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table) throw(SQLException, RuntimeException) + const ::rtl::OUString& table) throw(SQLException, RuntimeException) { openForeignKeys(catalog,!schema.compareToAscii("%") ? &schema : NULL,&table,Any(),NULL,NULL); } // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const ::rtl::OUString& schema, - const ::rtl::OUString& table) throw(SQLException, RuntimeException) + const ::rtl::OUString& table) throw(SQLException, RuntimeException) { const ::rtl::OUString *pSchemaPat = NULL; @@ -1230,7 +1230,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const ::rtl aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(); @@ -1259,7 +1259,7 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const : aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schemaPattern,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(tableNamePattern,m_nTextEncoding)).getStr(); @@ -1289,7 +1289,7 @@ void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const ::rtl: aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding); aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding); - const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, + const char *pPKQ = catalog.hasValue() && aPKQ.getLength() ? aPKQ.getStr() : NULL, *pPKO = pSchemaPat && pSchemaPat->getLength() ? aPKO.getStr() : NULL, *pPKN = (aPKN = ::rtl::OUStringToOString(table,m_nTextEncoding)).getStr(); diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx index 3c3d945f0d6d..c81198ebd6b2 100644 --- a/connectivity/source/drivers/odbcbase/ODriver.cxx +++ b/connectivity/source/drivers/odbcbase/ODriver.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/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx index a4b513eee998..2d13dd4e9147 100644 --- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.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 @@ -67,7 +67,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const ::rtl::O :OStatement_BASE2(_pConnection) ,numParams(0) ,boundParams(NULL) - ,m_bPrepared(sal_False) + ,m_bPrepared(sal_False) { m_sSqlStatement = sql; try @@ -79,7 +79,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const ::rtl::O ::rtl::OUString sNewSql; ::std::auto_ptr<OSQLParseNode> pNode( aParser.parseTree(sErrorMessage,sql) ); if ( pNode.get() ) - { // special handling for parameters + { // special handling for parameters OSQLParseNode::substituteParameterNames(pNode.get()); pNode->parseNodeToStr( sNewSql, _pConnection ); m_sSqlStatement = sNewSql; @@ -256,7 +256,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run if (!execute()) numRows = getUpdateCount (); - else + else { // No update count was produced (a ResultSet was). Raise // an exception @@ -293,7 +293,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE if (execute()) rs = getResultSet(sal_False); - else + else { // No ResultSet was produced. Raise an exception m_pConnection->throwGenericSQLException(STR_NO_RESULTSET,*this); @@ -352,7 +352,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex,sal_Int32 _nType, sal_Int8* bindBuf = allocBindBuf(parameterIndex, nRealSize); OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); - OTools::bindParameter( m_pConnection, + OTools::bindParameter( m_pConnection, m_aStatementHandle, parameterIndex, bindBuf, @@ -451,13 +451,13 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s SQLSMALLINT fSqlType = 0; SQLSMALLINT nDecimalDigits = 0; - OTools::getBindTypes( sal_False, + OTools::getBindTypes( sal_False, m_pConnection->useOldDateFormat(), (SQLSMALLINT)sqlType, fCType, fSqlType); - SQLRETURN nReturn = N3SQLBindParameter( m_aStatementHandle, + SQLRETURN nReturn = N3SQLBindParameter( m_aStatementHandle, (SQLUSMALLINT)parameterIndex, (SQLSMALLINT)SQL_PARAM_INPUT, fCType, @@ -527,14 +527,14 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c setNull(parameterIndex,sqlType); break; case DataType::DECIMAL: - { + { ORowSetValue aValue; aValue.fill(x); setDecimal(parameterIndex,aValue); } break; case DataType::NUMERIC: - { + { ORowSetValue aValue; aValue.fill(x); setString(parameterIndex,aValue); @@ -558,7 +558,7 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException) { if (!::dbtools::implSetObject(this, parameterIndex, x)) - { // there is no other setXXX call which can handle the value in x + { // there is no other setXXX call which can handle the value in x throw SQLException(); } } @@ -600,8 +600,8 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim // ------------------------------------------------------------------------- void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeException) { - // clearParameters( ); - // m_aBatchList.erase(); + // clearParameters( ); + // m_aBatchList.erase(); } // ------------------------------------------------------------------------- @@ -658,7 +658,7 @@ void OPreparedStatement::initBoundParam () throw(SQLException) // parameter. //-------------------------------------------------------------------- -sal_Int8* OPreparedStatement::allocBindBuf( sal_Int32 index,sal_Int32 bufLen) +sal_Int8* OPreparedStatement::allocBindBuf( sal_Int32 index,sal_Int32 bufLen) { sal_Int8* b = NULL; @@ -725,7 +725,7 @@ sal_Int8* OPreparedStatement::getLengthBuf (sal_Int32 index) // the column is considered to be NULL. //-------------------------------------------------------------------- -sal_Int32 OPreparedStatement::getParamLength ( sal_Int32 index) +sal_Int32 OPreparedStatement::getParamLength ( sal_Int32 index) { sal_Int32 paramLen = SQL_NULL_DATA; @@ -764,12 +764,12 @@ void OPreparedStatement::putParamData (sal_Int32 index) throw(SQLException) // Get the information about the input stream - Reference< XInputStream> inputStream = boundParams[index - 1].getInputStream (); + Reference< XInputStream> inputStream = boundParams[index - 1].getInputStream (); if ( !inputStream.is() ) { ::connectivity::SharedResources aResources; const ::rtl::OUString sError( aResources.getResourceString(STR_NO_INPUTSTREAM)); - throw SQLException (sError, *this,::rtl::OUString(),0,Any()); + throw SQLException (sError, *this,::rtl::OUString(),0,Any()); } sal_Int32 maxBytesLeft = boundParams[index - 1].getInputStreamLen (); @@ -871,7 +871,7 @@ void OPreparedStatement::setStream( // Bind the parameter with SQL_LEN_DATA_AT_EXEC SQLSMALLINT Ctype = SQL_C_CHAR; - SQLLEN atExec = SQL_LEN_DATA_AT_EXEC (length); + SQLLEN atExec = SQL_LEN_DATA_AT_EXEC (length); memcpy (dataBuf, &ParameterIndex, sizeof(ParameterIndex)); memcpy (lenBuf, &atExec, sizeof (atExec)); @@ -933,7 +933,7 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons } catch(const SQLException&) { - // throw Exception(e.Message,*this); + // throw Exception(e.Message,*this); } } // ----------------------------------------------------------------------------- @@ -952,7 +952,7 @@ void OPreparedStatement::prepareStatement() // ----------------------------------------------------------------------------- void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex) { - if( !_parameterIndex || _parameterIndex > numParams) + if( !_parameterIndex || _parameterIndex > numParams) { ::connectivity::SharedResources aResources; const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(STR_WRONG_PARAM_INDEX, diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx index 2b3c45b4214c..f33d2ec489b8 100644 --- a/connectivity/source/drivers/odbcbase/OResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/OResultSet.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 @@ -64,7 +64,7 @@ using namespace com::sun::star::util; #define ODBC_SQL_NOT_DEFINED 99UL //------------------------------------------------------------------------------ -// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); +// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) { return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.odbc.ResultSet"); @@ -90,7 +90,7 @@ sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceN } // ------------------------------------------------------------------------- -OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) : OResultSet_BASE(m_aMutex) +OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) : OResultSet_BASE(m_aMutex) ,OPropertySetHelper(OResultSet_BASE::rBHelper) ,m_aStatementHandle(_pStatementHandle) ,m_aConnectionHandle(pStmt->getConnectionHandle()) @@ -240,7 +240,7 @@ SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle) case DataType::BIT: case DataType::TINYINT: delete static_cast< sal_Int8* >(reinterpret_cast< void * >(pValue->first)); - break; + break; case DataType::SMALLINT: delete static_cast< sal_Int16* >(reinterpret_cast< void * >(pValue->first)); break; @@ -303,7 +303,7 @@ TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex) case DataType::BIT: case DataType::TINYINT: aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new sal_Int8(0)),_nType); - break; + break; case DataType::SMALLINT: aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new sal_Int16(0)),_nType); break; @@ -337,13 +337,13 @@ void OResultSet::allocBuffer() for(sal_Int32 i = 1;i<=nLen;++i) { sal_Int32 nType = xMeta->getColumnType(i); - m_aRow[i].setTypeKind( nType ); + m_aRow[i].setTypeKind( nType ); } m_aLengthVector.resize(nLen + 1); } // ------------------------------------------------------------------------- void OResultSet::releaseBuffer() -{ +{ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::releaseBuffer" ); unbind(sal_False); m_aLengthVector.clear(); @@ -357,7 +357,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException) { - OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -492,11 +492,11 @@ Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, R { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getDate" ); DATE_STRUCT aDate; - aDate.day = 0; + aDate.day = 0; aDate.month = 0; - aDate.year = 0; + aDate.year = 0; - const ORowSetValue& aValue = getValue( columnIndex, + const ORowSetValue& aValue = getValue( columnIndex, m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_DATE : SQL_C_TYPE_DATE, &aDate,sizeof aDate); return (&aValue == &m_aEmptyValue) ? Date(aDate.day,aDate.month,aDate.year) : (Date)aValue; @@ -616,7 +616,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getString" ); ::osl::MutexGuard aGuard( m_aMutex ); - + ::rtl::OUString nRet; if ( m_bFetchData ) nRet = getValue(columnIndex,0,NULL,0); @@ -852,7 +852,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) nMaxLen, &nRealLen ); - // Sequence<sal_Int8> aRealBookmark(nMaxLen); + // Sequence<sal_Int8> aRealBookmark(nMaxLen); sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( ODBC3SQLBulkOperations ) ); if ( bPositionByBookmark ) @@ -887,7 +887,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) else nRet = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_RELATIVE,0); // OJ 06.03.2004 // sometimes we got an error but we are not interested in anymore #106047# OJ - // OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this); + // OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this); nRet = unbind(); OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this); @@ -983,7 +983,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti m_nLastColumnPos = 0; // first unbound all columns OSL_VERIFY_EQUALS( unbind(), SQL_SUCCESS, "Could not unbind columns!" ); - // SQLRETURN nRet = N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE ,(SQLPOINTER)1,SQL_IS_INTEGER); + // SQLRETURN nRet = N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE ,(SQLPOINTER)1,SQL_IS_INTEGER); m_bInserting = sal_True; } // ------------------------------------------------------------------------- @@ -1002,7 +1002,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pVa m_aBindVector.push_back(allocBindColumn(OTools::MapOdbcType2Jdbc(_nType),columnIndex)); void* pData = reinterpret_cast<void*>(m_aBindVector.rbegin()->first); OSL_ENSURE(pData != NULL,"Data for update is NULL!"); - OTools::bindValue( m_pStatement->getOwnConnection(), + OTools::bindValue( m_pStatement->getOwnConnection(), m_aStatementHandle, columnIndex, _nType, @@ -1124,7 +1124,7 @@ void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - // SQLRETURN nRet = N3SQLSetPos(m_aStatementHandle,1,SQL_REFRESH,SQL_LOCK_NO_CHANGE); + // SQLRETURN nRet = N3SQLSetPos(m_aStatementHandle,1,SQL_REFRESH,SQL_LOCK_NO_CHANGE); m_nCurrentFetchState = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_RELATIVE,0); OTools::ThrowException(m_pStatement->getOwnConnection(),m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this); } @@ -1243,10 +1243,10 @@ sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& /*bookmark*/ ) throw( S Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw( SQLException, RuntimeException) { Sequence< sal_Int32 > aRet(rows.getLength()); - sal_Int32 *pRet = aRet.getArray(); + sal_Int32 *pRet = aRet.getArray(); - const Any *pBegin = rows.getConstArray(); - const Any *pEnd = pBegin + rows.getLength(); + const Any *pBegin = rows.getConstArray(); + const Any *pEnd = pBegin + rows.getLength(); for(;pBegin != pEnd;++pBegin,++pRet) { @@ -1353,7 +1353,7 @@ sal_Bool OResultSet::isBookmarkable() const { return sal_False; } - + if ( m_nUseBookmarks == ODBC_SQL_NOT_DEFINED ) { m_nUseBookmarks = SQL_UB_OFF; @@ -1382,12 +1382,12 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); - DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); + DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); } @@ -1483,9 +1483,9 @@ void OResultSet::fillRow(sal_Int32 _nToColumn) } m_bFetchData = sal_False; - sal_Int32 nColumn = m_nLastColumnPos + 1; - TDataRow::iterator pColumn = m_aRow.begin() + nColumn; - TDataRow::iterator pColumnEnd = m_aRow.begin() + _nToColumn + 1; + sal_Int32 nColumn = m_nLastColumnPos + 1; + TDataRow::iterator pColumn = m_aRow.begin() + nColumn; + TDataRow::iterator pColumnEnd = m_aRow.begin() + _nToColumn + 1; for (; pColumn < pColumnEnd; ++nColumn, ++pColumn) { diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx index 34f60939f9f8..af21829918c1 100644 --- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx +++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.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/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx index 1a6b2d49e551..dcf62bf3c6a3 100644 --- a/connectivity/source/drivers/odbcbase/OStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OStatement.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 @@ -57,13 +57,13 @@ using namespace ::comphelper; OTools::ThrowException(m_pConnection,x,m_aStatementHandle,SQL_HANDLE_STMT,*this) #if OSL_DEBUG_LEVEL > 1 -#define DEBUG_THROW \ - try \ - { \ - THROW_SQL(nRetCode); \ - } \ - catch(SQLException&) \ - { \ +#define DEBUG_THROW \ + try \ + { \ + THROW_SQL(nRetCode); \ + } \ + catch(SQLException&) \ + { \ OSL_ENSURE(0,"Exception in odbc catched"); \ } #endif @@ -162,7 +162,7 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); Sequence< Type > aOldTypes = OStatement_BASE::getTypes(); @@ -178,7 +178,7 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException) // ------------------------------------------------------------------------- Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues( ) throw (SQLException, RuntimeException) { - OSL_ENSURE( m_pConnection && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!"); + OSL_ENSURE( m_pConnection && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!"); Reference< XResultSet > xRes; if ( m_pConnection ) { @@ -320,7 +320,7 @@ sal_Bool OStatement_Base::lockIfNecessary (const ::rtl::OUString& sql) throw( SQ // Sets the warning //-------------------------------------------------------------------- -void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) +void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -340,7 +340,7 @@ sal_Int32 OStatement_Base::getColumnCount () throw( SQLException) checkDisposed(OStatement_BASE::rBHelper.bDisposed); - sal_Int16 numCols = 0; + sal_Int16 numCols = 0; OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); try { @@ -450,7 +450,7 @@ Reference< XResultSet > OStatement_Base::getResultSet (sal_Bool checkCount) thro sal_Int32 OStatement_Base::getStmtOption (short fOption) const { - sal_Int32 result = 0; + sal_Int32 result = 0; OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); N3SQLGetStmtAttr(m_aStatementHandle, fOption,&result,SQL_IS_INTEGER,NULL); return result; @@ -562,7 +562,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql ) ::connectivity::SharedResources aResources; const ::rtl::OUString sError( aResources.getResourceString(STR_NO_ROWCOUNT)); - throw SQLException (sError, *this,::rtl::OUString(),0,Any()); + throw SQLException (sError, *this,::rtl::OUString(),0,Any()); } return numRows; @@ -604,7 +604,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim checkDisposed(OStatement_BASE::rBHelper.bDisposed); - SQLWarning warning; + SQLWarning warning; sal_Bool hasResultSet = sal_False; // clear previous warnings @@ -800,10 +800,10 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) switch(_par0) { case ResultSetType::FORWARD_ONLY: - nSet = SQL_UNSPECIFIED; + nSet = SQL_UNSPECIFIED; break; case ResultSetType::SCROLL_INSENSITIVE: - nSet = SQL_INSENSITIVE; + nSet = SQL_INSENSITIVE; N3SQLSetStmtAttr(m_aStatementHandle, SQL_ATTR_CURSOR_TYPE,(SQLPOINTER)SQL_CURSOR_KEYSET_DRIVEN,SQL_IS_UINTEGER); break; case ResultSetType::SCROLL_SENSITIVE: @@ -816,7 +816,7 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) sal_Bool bNotBookmarks = ((nCurProp & SQL_CA1_BOOKMARK) != SQL_CA1_BOOKMARK); nCurProp = getCursorProperties(SQL_CURSOR_KEYSET_DRIVEN,sal_False); nSet = SQL_CURSOR_KEYSET_DRIVEN; - if( bNotBookmarks || + if( bNotBookmarks || ((nCurProp & SQL_CA2_SENSITIVITY_DELETIONS) != SQL_CA2_SENSITIVITY_DELETIONS) || ((nCurProp & SQL_CA2_SENSITIVITY_ADDITIONS) != SQL_CA2_SENSITIVITY_ADDITIONS)) { @@ -835,7 +835,7 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) nSet = SQL_CURSOR_KEYSET_DRIVEN; N3SQLSetStmtAttr(m_aStatementHandle, SQL_ATTR_CURSOR_TYPE,(SQLPOINTER)nSet,SQL_IS_UINTEGER); } - nSet = SQL_SENSITIVE; + nSet = SQL_SENSITIVE; break; default: OSL_ENSURE( false, "OStatement_Base::setResultSetType: invalid result set type!" ); @@ -859,7 +859,7 @@ void OStatement_Base::setFetchDirection(sal_Int32 _par0) { OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); sal_Int32 nCursType = 0; - SQLRETURN nRetCode = SQL_SUCCESS; + SQLRETURN nRetCode = SQL_SUCCESS; if(_par0 == FetchDirection::FORWARD) { nCursType = SQL_NONSCROLLABLE; @@ -928,12 +928,12 @@ void OStatement_Base::setUsingBookmarks(sal_Bool _bUseBookmark) Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -1004,7 +1004,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( } catch(const SQLException&) { - // throw Exception(e.Message,*this); + // throw Exception(e.Message,*this); } return bConverted; } @@ -1052,7 +1052,7 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A } catch(const SQLException& ) { - // throw Exception(e.Message,*this); + // throw Exception(e.Message,*this); } } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx index 76d44d533834..f48ac3c08da0 100644 --- a/connectivity/source/drivers/odbcbase/OTools.cxx +++ b/connectivity/source/drivers/odbcbase/OTools.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 @@ -47,7 +47,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::sdbc; using namespace com::sun::star::util; -void OTools::getValue( OConnection* _pConnection, +void OTools::getValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _nType, @@ -69,7 +69,7 @@ void OTools::getValue( OConnection* _pConnection, _bWasNull = pcbValue == SQL_NULL_DATA; } // ----------------------------------------------------------------------------- -void OTools::bindParameter( OConnection* _pConnection, +void OTools::bindParameter( OConnection* _pConnection, SQLHANDLE _hStmt, sal_Int32 nPos, sal_Int8*& pDataBuffer, @@ -87,10 +87,10 @@ void OTools::bindParameter( OConnection* _pConnection, SQLSMALLINT fSqlType; SQLSMALLINT fCType; SQLLEN nMaxLen = 0; - // void*& pData = pDataBuffer; + // void*& pData = pDataBuffer; SQLLEN* pLen = (SQLLEN*)pLenBuffer; SQLULEN nColumnSize=0; - SQLSMALLINT nDecimalDigits=0; + SQLSMALLINT nDecimalDigits=0; OTools::getBindTypes(_bUseWChar,_bUseOldTimeDate,_nODBCtype,fCType,fSqlType); @@ -102,7 +102,7 @@ void OTools::bindParameter( OConnection* _pConnection, memcpy(pDataBuffer,&nPos,sizeof(nPos)); // 20.09.2001 OJ: Problems with mysql. mysql returns only CHAR as parameter type - // nRetcode = (*(T3SQLDescribeParam)_pConnection->getOdbcFunction(ODBC3SQLDescribeParam))(_hStmt,(SQLUSMALLINT)nPos,&fSqlType,&nColumnSize,&nDecimalDigits,&nNullable); + // nRetcode = (*(T3SQLDescribeParam)_pConnection->getOdbcFunction(ODBC3SQLDescribeParam))(_hStmt,(SQLUSMALLINT)nPos,&fSqlType,&nColumnSize,&nDecimalDigits,&nNullable); nRetcode = (*(T3SQLBindParameter)_pConnection->getOdbcFunction(ODBC3SQLBindParameter))(_hStmt, (SQLUSMALLINT)nPos, @@ -118,7 +118,7 @@ void OTools::bindParameter( OConnection* _pConnection, OTools::ThrowException(_pConnection,nRetcode,_hStmt,SQL_HANDLE_STMT,_xInterface); } // ----------------------------------------------------------------------------- -void OTools::bindData( SQLSMALLINT _nOdbcType, +void OTools::bindData( SQLSMALLINT _nOdbcType, sal_Bool _bUseWChar, sal_Int8 *&_pData, SQLLEN*& pLen, @@ -159,7 +159,7 @@ void OTools::bindData( SQLSMALLINT _nOdbcType, *pLen = sizeof(sal_Int64); _nColumnSize = *pLen; break; - + case SQL_NUMERIC: if(_bUseWChar) { @@ -177,7 +177,7 @@ void OTools::bindData( SQLSMALLINT _nOdbcType, *pLen = _nColumnSize; memcpy(_pData,aString.getStr(),aString.getLength()); ((sal_Int8*)_pData)[_nColumnSize] = '\0'; - } break; + } break; case SQL_BIT: case SQL_TINYINT: *((sal_Int8*)_pData) = *(sal_Int8*)_pValue; @@ -251,7 +251,7 @@ void OTools::bindData( SQLSMALLINT _nOdbcType, } } // ------------------------------------------------------------------------- -void OTools::bindValue( OConnection* _pConnection, +void OTools::bindValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _nType, @@ -269,7 +269,7 @@ void OTools::bindValue( OConnection* _pConnection, SQLSMALLINT fCType; SQLLEN nMaxLen = _nMaxLen; - OTools::getBindTypes( sal_False, + OTools::getBindTypes( sal_False, _bUseOldTimeDate, _nType, fCType, @@ -295,15 +295,15 @@ void OTools::bindValue( OConnection* _pConnection, case SQL_CHAR: case SQL_VARCHAR: //if(GetODBCConnection()->m_bUserWChar) -// { -// _nMaxLen = rCol.GetPrecision(); -// *pLen = SQL_NTS; -// *((rtl::OUString*)pData) = (rtl::OUString)_aValue; +// { +// _nMaxLen = rCol.GetPrecision(); +// *pLen = SQL_NTS; +// *((rtl::OUString*)pData) = (rtl::OUString)_aValue; // -// // Zeiger auf Char* -// pData = (void*)((rtl::OUString*)pData)->getStr(); -// } -// else +// // Zeiger auf Char* +// pData = (void*)((rtl::OUString*)pData)->getStr(); +// } +// else { ::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding)); *pLen = SQL_NTS; @@ -312,7 +312,7 @@ void OTools::bindValue( OConnection* _pConnection, // Zeiger auf Char* _pData = (void*)aString.getStr(); - } break; + } break; case SQL_BIGINT: *((sal_Int64*)_pData) = *(sal_Int64*)_pValue; *pLen = sizeof(sal_Int64); @@ -320,14 +320,14 @@ void OTools::bindValue( OConnection* _pConnection, case SQL_DECIMAL: case SQL_NUMERIC: //if(GetODBCConnection()->m_bUserWChar) -// { -// rtl::OUString aString(rtl::OUString(SdbTools::ToString(ODbTypeConversion::toDouble(*pVariable),rCol.GetScale()))); -// *pLen = _nMaxLen; -// *((rtl::OUString*)_pData) = aString; -// // Zeiger auf Char* -// _pData = (void*)((rtl::OUString*)_pData)->getStr(); -// } -// else +// { +// rtl::OUString aString(rtl::OUString(SdbTools::ToString(ODbTypeConversion::toDouble(*pVariable),rCol.GetScale()))); +// *pLen = _nMaxLen; +// *((rtl::OUString*)_pData) = aString; +// // Zeiger auf Char* +// _pData = (void*)((rtl::OUString*)_pData)->getStr(); +// } +// else { ::rtl::OString aString = ::rtl::OString::valueOf(*(double*)_pValue); _nMaxLen = (SQLSMALLINT)aString.getLength(); @@ -335,7 +335,7 @@ void OTools::bindValue( OConnection* _pConnection, *((::rtl::OString*)_pData) = aString; // Zeiger auf Char* _pData = (void*)((::rtl::OString*)_pData)->getStr(); - } break; + } break; case SQL_BIT: case SQL_TINYINT: *((sal_Int8*)_pData) = *(sal_Int8*)_pValue; @@ -365,7 +365,7 @@ void OTools::bindValue( OConnection* _pConnection, { _pData = (void*)((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getConstArray(); *pLen = ((const ::com::sun::star::uno::Sequence< sal_Int8 > *)_pValue)->getLength(); - } break; + } break; case SQL_LONGVARBINARY: { _pData = (void*)(columnIndex); @@ -463,7 +463,7 @@ void OTools::ThrowException(OConnection* _pConnection, OSL_ENSURE(n == SQL_SUCCESS || n == SQL_SUCCESS_WITH_INFO || n == SQL_NO_DATA_FOUND || n == SQL_ERROR,"SdbODBC3_SetStatus: SQLError failed"); // Zum Return Code von SQLError siehe ODBC 2.0 Programmer's Reference Seite 287ff - throw SQLException( ::rtl::OUString((char *)szErrorMessage,pcbErrorMsg,_nTextEncoding), + throw SQLException( ::rtl::OUString((char *)szErrorMessage,pcbErrorMsg,_nTextEncoding), _xInterface, ::rtl::OUString((char *)szSqlState,5,_nTextEncoding), pfNativeError, @@ -484,7 +484,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, // Erstmal versuchen, die Daten mit dem kleinen Puffer // abzuholen: SQLLEN nMaxLen = sizeof aCharArray - 1; - // GETDATA(SQL_C_CHAR,aCharArray,nMaxLen); + // GETDATA(SQL_C_CHAR,aCharArray,nMaxLen); SQLLEN pcbValue = 0; OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle, (SQLUSMALLINT)columnIndex, @@ -519,7 +519,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, nBytes = nMaxLen; // Solange eine "truncation"-Warnung vorliegt, weiter Daten abholen - // GETDATA(SQL_C_CHAR,aCharArray, nLen + 1); + // GETDATA(SQL_C_CHAR,aCharArray, nLen + 1); OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle, (SQLUSMALLINT)columnIndex, SQL_C_BINARY, @@ -553,7 +553,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, sal_Unicode waCharArray[2048]; // read the unicode data SQLLEN nMaxLen = (sizeof(waCharArray) / sizeof(sal_Unicode)) - 1; - // GETDATA(SQL_C_WCHAR, waCharArray, nMaxLen + sizeof(sal_Unicode)); + // GETDATA(SQL_C_WCHAR, waCharArray, nMaxLen + sizeof(sal_Unicode)); SQLLEN pcbValue=0; OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle, @@ -590,7 +590,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, nLen = nMaxLen; // Solange eine "truncation"-Warnung vorliegt, weiter Daten abholen - // GETDATA(SQL_C_CHAR,waCharArray, nLen + 1); + // GETDATA(SQL_C_CHAR,waCharArray, nLen + 1); OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle, (SQLUSMALLINT)columnIndex, SQL_C_WCHAR, @@ -614,7 +614,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, // Erstmal versuchen, die Daten mit dem kleinen Puffer // abzuholen: SQLLEN nMaxLen = sizeof aCharArray - 1; - // GETDATA(SQL_C_CHAR,aCharArray,nMaxLen); + // GETDATA(SQL_C_CHAR,aCharArray,nMaxLen); SQLLEN pcbValue = 0; OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle, (SQLUSMALLINT)columnIndex, @@ -640,7 +640,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, while ((pcbValue == SQL_NO_TOTAL) || pcbValue > nMaxLen) { // Solange eine "truncation"-Warnung vorliegt, weiter Daten abholen - // GETDATA(SQL_C_CHAR,aCharArray, nLen + 1); + // GETDATA(SQL_C_CHAR,aCharArray, nLen + 1); OTools::ThrowException(_pConnection,(*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle, (SQLUSMALLINT)columnIndex, SQL_C_CHAR, @@ -657,7 +657,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, } // delete all blanks - // aData.EraseTrailingChars(); + // aData.EraseTrailingChars(); } } @@ -687,7 +687,7 @@ void OTools::GetInfo(OConnection* _pConnection, const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) { SQLSMALLINT nValueLen; - _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) + _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) OTools::ThrowException(_pConnection, (*(T3SQLGetInfo)_pConnection->getOdbcFunction(ODBC3SQLGetInfo))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen), _aConnectionHandle,SQL_HANDLE_DBC,_xInterface); @@ -700,7 +700,7 @@ void OTools::GetInfo(OConnection* _pConnection, const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) { SQLSMALLINT nValueLen; - _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) + _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) OTools::ThrowException(_pConnection, (*(T3SQLGetInfo)_pConnection->getOdbcFunction(ODBC3SQLGetInfo))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen), _aConnectionHandle,SQL_HANDLE_DBC,_xInterface); @@ -713,7 +713,7 @@ void OTools::GetInfo(OConnection* _pConnection, const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) { SQLSMALLINT nValueLen; - _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) + _rValue = 0; // in case the driver uses only 16 of the 32 bits (as it does, for example, for SQL_CATALOG_LOCATION) OTools::ThrowException(_pConnection, (*(T3SQLGetInfo)_pConnection->getOdbcFunction(ODBC3SQLGetInfo))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen), _aConnectionHandle,SQL_HANDLE_DBC,_xInterface); @@ -843,7 +843,7 @@ void OTools::getBindTypes(sal_Bool _bUseWChar, RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getBindTypes" ); switch(_nOdbcType) { - case SQL_CHAR: if(_bUseWChar) + case SQL_CHAR: if(_bUseWChar) { fCType = SQL_C_WCHAR; fSqlType = SQL_WCHAR; @@ -854,7 +854,7 @@ void OTools::getBindTypes(sal_Bool _bUseWChar, fSqlType = SQL_CHAR; } break; - case SQL_VARCHAR: if(_bUseWChar) + case SQL_VARCHAR: if(_bUseWChar) { fCType = SQL_C_WCHAR; fSqlType = SQL_WVARCHAR; @@ -865,82 +865,82 @@ void OTools::getBindTypes(sal_Bool _bUseWChar, fSqlType = SQL_VARCHAR; } break; - case SQL_LONGVARCHAR: if(_bUseWChar) + case SQL_LONGVARCHAR: if(_bUseWChar) { fCType = SQL_C_WCHAR; fSqlType = SQL_WLONGVARCHAR; } else { - fCType = SQL_C_CHAR; + fCType = SQL_C_CHAR; fSqlType = SQL_LONGVARCHAR; } break; - case SQL_DECIMAL: fCType = _bUseWChar ? SQL_C_WCHAR : SQL_C_CHAR; - fSqlType = SQL_DECIMAL; break; - case SQL_NUMERIC: fCType = _bUseWChar ? SQL_C_WCHAR : SQL_C_CHAR; - fSqlType = SQL_NUMERIC; break; - case SQL_BIT: fCType = SQL_C_TINYINT; - fSqlType = SQL_INTEGER; break; - case SQL_TINYINT: fCType = SQL_C_TINYINT; - fSqlType = SQL_TINYINT; break; - case SQL_SMALLINT: fCType = SQL_C_SHORT; - fSqlType = SQL_SMALLINT; break; - case SQL_INTEGER: fCType = SQL_C_LONG; - fSqlType = SQL_INTEGER; break; - case SQL_BIGINT: fCType = SQL_C_SBIGINT; - fSqlType = SQL_BIGINT; break; - case SQL_FLOAT: fCType = SQL_C_FLOAT; - fSqlType = SQL_FLOAT; break; - case SQL_REAL: fCType = SQL_C_DOUBLE; - fSqlType = SQL_REAL; break; - case SQL_DOUBLE: fCType = SQL_C_DOUBLE; - fSqlType = SQL_DOUBLE; break; - case SQL_BINARY: fCType = SQL_C_BINARY; - fSqlType = SQL_BINARY; break; + case SQL_DECIMAL: fCType = _bUseWChar ? SQL_C_WCHAR : SQL_C_CHAR; + fSqlType = SQL_DECIMAL; break; + case SQL_NUMERIC: fCType = _bUseWChar ? SQL_C_WCHAR : SQL_C_CHAR; + fSqlType = SQL_NUMERIC; break; + case SQL_BIT: fCType = SQL_C_TINYINT; + fSqlType = SQL_INTEGER; break; + case SQL_TINYINT: fCType = SQL_C_TINYINT; + fSqlType = SQL_TINYINT; break; + case SQL_SMALLINT: fCType = SQL_C_SHORT; + fSqlType = SQL_SMALLINT; break; + case SQL_INTEGER: fCType = SQL_C_LONG; + fSqlType = SQL_INTEGER; break; + case SQL_BIGINT: fCType = SQL_C_SBIGINT; + fSqlType = SQL_BIGINT; break; + case SQL_FLOAT: fCType = SQL_C_FLOAT; + fSqlType = SQL_FLOAT; break; + case SQL_REAL: fCType = SQL_C_DOUBLE; + fSqlType = SQL_REAL; break; + case SQL_DOUBLE: fCType = SQL_C_DOUBLE; + fSqlType = SQL_DOUBLE; break; + case SQL_BINARY: fCType = SQL_C_BINARY; + fSqlType = SQL_BINARY; break; case SQL_VARBINARY: - fCType = SQL_C_BINARY; - fSqlType = SQL_VARBINARY; break; - case SQL_LONGVARBINARY: fCType = SQL_C_BINARY; - fSqlType = SQL_LONGVARBINARY; break; + fCType = SQL_C_BINARY; + fSqlType = SQL_VARBINARY; break; + case SQL_LONGVARBINARY: fCType = SQL_C_BINARY; + fSqlType = SQL_LONGVARBINARY; break; case SQL_DATE: if(_bUseOldTimeDate) { - fCType = SQL_C_DATE; - fSqlType = SQL_DATE; + fCType = SQL_C_DATE; + fSqlType = SQL_DATE; } else { - fCType = SQL_C_TYPE_DATE; - fSqlType = SQL_TYPE_DATE; + fCType = SQL_C_TYPE_DATE; + fSqlType = SQL_TYPE_DATE; } break; case SQL_TIME: if(_bUseOldTimeDate) { - fCType = SQL_C_TIME; - fSqlType = SQL_TIME; + fCType = SQL_C_TIME; + fSqlType = SQL_TIME; } else { - fCType = SQL_C_TYPE_TIME; - fSqlType = SQL_TYPE_TIME; + fCType = SQL_C_TYPE_TIME; + fSqlType = SQL_TYPE_TIME; } break; case SQL_TIMESTAMP: if(_bUseOldTimeDate) { - fCType = SQL_C_TIMESTAMP; - fSqlType = SQL_TIMESTAMP; + fCType = SQL_C_TIMESTAMP; + fSqlType = SQL_TIMESTAMP; } else { - fCType = SQL_C_TYPE_TIMESTAMP; - fSqlType = SQL_TYPE_TIMESTAMP; + fCType = SQL_C_TYPE_TIMESTAMP; + fSqlType = SQL_TYPE_TIMESTAMP; } break; - default: fCType = SQL_C_BINARY; - fSqlType = SQL_LONGVARBINARY; break; + default: fCType = SQL_C_BINARY; + fSqlType = SQL_LONGVARBINARY; break; } } diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx index 0284c70fab89..ff48a26c560c 100644 --- a/connectivity/source/inc/AutoRetrievingBase.hxx +++ b/connectivity/source/inc/AutoRetrievingBase.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 @@ -36,19 +36,19 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OAutoRetrievingBase { ::rtl::OUString m_sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values - sal_Bool m_bAutoRetrievingEnabled; // set to when we should allow to query for generated values + sal_Bool m_bAutoRetrievingEnabled; // set to when we should allow to query for generated values protected: OAutoRetrievingBase() : m_bAutoRetrievingEnabled(sal_False) {} virtual ~OAutoRetrievingBase(){} - inline void enableAutoRetrievingEnabled(sal_Bool _bAutoEnable) { m_bAutoRetrievingEnabled = _bAutoEnable; } - inline void setAutoRetrievingStatement(const ::rtl::OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } + inline void enableAutoRetrievingEnabled(sal_Bool _bAutoEnable) { m_bAutoRetrievingEnabled = _bAutoEnable; } + inline void setAutoRetrievingStatement(const ::rtl::OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } public: - inline sal_Bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } - inline const ::rtl::OUString& getAutoRetrievingStatement() const { return m_sGeneratedValueStatement; } + inline sal_Bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } + inline const ::rtl::OUString& getAutoRetrievingStatement() const { return m_sGeneratedValueStatement; } /** transform the statement to query for auto generated values - @param _sInsertStatement + @param _sInsertStatement The "INSERT" statement, is used to query for column and table names @return The transformed generated statement. diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index c51468c0ff4d..1d495aee63ec 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.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,14 +62,14 @@ namespace connectivity ::com::sun::star::lang::XServiceInfo, ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; - // typedef ORefVector<ORowSetValue> ORow; - // typedef ORefVector<ORow> ORows; + // typedef ORefVector<ORowSetValue> ORow; + // typedef ORefVector<ORow> ORows; class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, - public ODatabaseMetaDataResultSet_BASE, - public ::comphelper::OPropertyContainer, - public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> + public ODatabaseMetaDataResultSet_BASE, + public ::comphelper::OPropertyContainer, + public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { public: @@ -115,28 +115,28 @@ namespace connectivity }; private: - ORowSetValue m_aEmptyValue; + ORowSetValue m_aEmptyValue; ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - sal_Int32 m_nColPos; + sal_Int32 m_nColPos; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; void construct(); void checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException); void setType(MetaDataResultSetType _eType); protected: - ORows m_aRows; - ORows::iterator m_aRowsIter; - sal_Bool m_bBOF; + ORows m_aRows; + ORows::iterator m_aRowsIter; + sal_Bool m_bBOF; sal_Bool m_bEOF; virtual const ORowSetValue& getValue(sal_Int32 columnIndex); - + // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper @@ -145,8 +145,8 @@ namespace connectivity virtual ~ODatabaseMetaDataResultSet(); 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(); /// default construction ODatabaseMetaDataResultSet(); @@ -156,7 +156,7 @@ namespace connectivity void setRows(const ORows& _rRows); // XServiceInfo - + static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); @@ -245,8 +245,8 @@ namespace connectivity void setBestRowIdentifierMap(); void setVersionColumnsMap(); public: - // some methods to get already defined ORowSetValues - // this increase the reuse of ORowSetValues + // some methods to get already defined ORowSetValues + // this increase the reuse of ORowSetValues /// return an empty ORowSetValueDecorator static ORowSetValueDecoratorRef getEmptyValue(); /// return an ORowSetValueDecorator with 0 as value diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index 6f2a318e6e1c..06be3a5521c3 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.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,19 +46,19 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; - class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE + class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { - TIntVector m_vMapping; // when not every column is needed - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; + TIntVector m_vMapping; // when not every column is needed + ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; - sal_Int32 m_nColCount; + sal_Int32 m_nColCount; protected: virtual ~ODatabaseMetaDataResultSetMetaData(); public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSetMetaData( ) - : m_nColCount(0) + : m_nColCount(0) { } /// Avoid ambigous cast error from the compiler. diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index baa54737f482..a03750d90855 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.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 @@ -45,45 +45,45 @@ namespace connectivity ::rtl::OUString m_ColumnTypeName; ::rtl::OUString m_ColumnServiceName; - sal_Int32 m_Nullable; - sal_Int32 m_ColumnDisplaySize; - sal_Int32 m_Precision; - sal_Int32 m_Scale; - sal_Int32 m_ColumnType; - - sal_Bool m_AutoIncrement; - sal_Bool m_CaseSensitive; - sal_Bool m_Searchable; - sal_Bool m_Currency; - sal_Bool m_Signed; - sal_Bool m_ReadOnly; - sal_Bool m_Writable; - sal_Bool m_DefinitelyWritable; + sal_Int32 m_Nullable; + sal_Int32 m_ColumnDisplaySize; + sal_Int32 m_Precision; + sal_Int32 m_Scale; + sal_Int32 m_ColumnType; + + sal_Bool m_AutoIncrement; + sal_Bool m_CaseSensitive; + sal_Bool m_Searchable; + sal_Bool m_Currency; + sal_Bool m_Signed; + sal_Bool m_ReadOnly; + sal_Bool m_Writable; + sal_Bool m_DefinitelyWritable; public: OColumn() {} OColumn(const ::rtl::OUString &_aTableName, const ::rtl::OUString &_aColumnName, - sal_Int32 _aNullable=0, - sal_Int32 _aColumnDisplaySize=0, - sal_Int32 _aPrecision=0, - sal_Int32 _aScale=0, - sal_Int32 _aColumnType=0, - - sal_Bool _aAutoIncrement=sal_False, - sal_Bool _aCaseSensitive=sal_False, - sal_Bool _aSearchable=sal_True, - sal_Bool _aCurrency=sal_False, - sal_Bool _aSigned=sal_False, - sal_Bool _aReadOnly=sal_True, - sal_Bool _aWritable=sal_False, - sal_Bool _aDefinitelyWritable=sal_False, + sal_Int32 _aNullable=0, + sal_Int32 _aColumnDisplaySize=0, + sal_Int32 _aPrecision=0, + sal_Int32 _aScale=0, + sal_Int32 _aColumnType=0, + + sal_Bool _aAutoIncrement=sal_False, + sal_Bool _aCaseSensitive=sal_False, + sal_Bool _aSearchable=sal_True, + sal_Bool _aCurrency=sal_False, + sal_Bool _aSigned=sal_False, + sal_Bool _aReadOnly=sal_True, + sal_Bool _aWritable=sal_False, + sal_Bool _aDefinitelyWritable=sal_False, const ::rtl::OUString &_aColumnLabel = ::rtl::OUString(), const ::rtl::OUString &_aColumnTypeName = ::rtl::OUString(), const ::rtl::OUString &_aColumnServiceName = ::rtl::OUString()) - : m_TableName(_aTableName), + : m_TableName(_aTableName), m_ColumnName(_aColumnName), m_ColumnLabel(_aColumnLabel), m_ColumnTypeName(_aColumnTypeName), @@ -117,28 +117,28 @@ namespace connectivity inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) { } - sal_Bool isAutoIncrement() const { return m_AutoIncrement; } - sal_Bool isCaseSensitive() const { return m_CaseSensitive; } - sal_Bool isSearchable() const { return m_Searchable; } - sal_Bool isCurrency() const { return m_Currency; } - sal_Bool isSigned() const { return m_Signed; } - sal_Bool isReadOnly() const { return m_ReadOnly; } - sal_Bool isWritable() const { return m_Writable; } - sal_Bool isDefinitelyWritable() const { return m_DefinitelyWritable; } - - sal_Int32 isNullable() const { return m_Nullable; } - sal_Int32 getColumnDisplaySize() const { return m_ColumnDisplaySize; } - sal_Int32 getPrecision() const { return m_Precision; } - sal_Int32 getScale() const { return m_Scale; } - sal_Int32 getColumnType() const { return m_ColumnType; } - - const ::rtl::OUString& getColumnLabel() const { return m_ColumnLabel; } - const ::rtl::OUString& getColumnName() const { return m_ColumnName; } - const ::rtl::OUString& getSchemaName() const { return m_SchemaName; } - const ::rtl::OUString& getTableName() const { return m_TableName; } - const ::rtl::OUString& getCatalogName() const { return m_CatalogName; } - const ::rtl::OUString& getColumnTypeName() const { return m_ColumnTypeName; } - const ::rtl::OUString& getColumnServiceName() const { return m_ColumnServiceName; } + sal_Bool isAutoIncrement() const { return m_AutoIncrement; } + sal_Bool isCaseSensitive() const { return m_CaseSensitive; } + sal_Bool isSearchable() const { return m_Searchable; } + sal_Bool isCurrency() const { return m_Currency; } + sal_Bool isSigned() const { return m_Signed; } + sal_Bool isReadOnly() const { return m_ReadOnly; } + sal_Bool isWritable() const { return m_Writable; } + sal_Bool isDefinitelyWritable() const { return m_DefinitelyWritable; } + + sal_Int32 isNullable() const { return m_Nullable; } + sal_Int32 getColumnDisplaySize() const { return m_ColumnDisplaySize; } + sal_Int32 getPrecision() const { return m_Precision; } + sal_Int32 getScale() const { return m_Scale; } + sal_Int32 getColumnType() const { return m_ColumnType; } + + const ::rtl::OUString& getColumnLabel() const { return m_ColumnLabel; } + const ::rtl::OUString& getColumnName() const { return m_ColumnName; } + const ::rtl::OUString& getSchemaName() const { return m_SchemaName; } + const ::rtl::OUString& getTableName() const { return m_TableName; } + const ::rtl::OUString& getCatalogName() const { return m_CatalogName; } + const ::rtl::OUString& getColumnTypeName() const { return m_ColumnTypeName; } + const ::rtl::OUString& getColumnServiceName() const { return m_ColumnServiceName; } }; } diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx index 8db7336b16d1..947f1e4b2d1d 100644 --- a/connectivity/source/inc/OSubComponent.hxx +++ b/connectivity/source/inc/OSubComponent.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 @@ -60,7 +60,7 @@ namespace connectivity protected: // the parent must support the tunnel implementation ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; - SELF* m_pDerivedImplementation; + SELF* m_pDerivedImplementation; public: OSubComponent( diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index 13f0fd2975ce..5dc25cea1799 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.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 @@ -37,28 +37,28 @@ namespace connectivity { struct OTypeInfo { - ::rtl::OUString aTypeName; // Name des Types in der Datenbank - ::rtl::OUString aLiteralPrefix; // Prefix zum Quoten - ::rtl::OUString aLiteralSuffix; // Suffix zum Quoten - ::rtl::OUString aCreateParams; // Parameter zum Erstellen - ::rtl::OUString aLocalTypeName; + ::rtl::OUString aTypeName; // Name des Types in der Datenbank + ::rtl::OUString aLiteralPrefix; // Prefix zum Quoten + ::rtl::OUString aLiteralSuffix; // Suffix zum Quoten + ::rtl::OUString aCreateParams; // Parameter zum Erstellen + ::rtl::OUString aLocalTypeName; - sal_Int32 nPrecision; // Laenge des Types + sal_Int32 nPrecision; // Laenge des Types - sal_Int16 nMaximumScale; // Nachkommastellen - sal_Int16 nMinimumScale; // Min Nachkommastellen + sal_Int16 nMaximumScale; // Nachkommastellen + sal_Int16 nMinimumScale; // Min Nachkommastellen - sal_Int16 nType; // Datenbanktyp - sal_Int16 nSearchType; // kann nach dem Typen gesucht werden - sal_Int16 nNumPrecRadix; // indicating the radix, which is usually 2 or 10 + sal_Int16 nType; // Datenbanktyp + sal_Int16 nSearchType; // kann nach dem Typen gesucht werden + sal_Int16 nNumPrecRadix; // indicating the radix, which is usually 2 or 10 - sal_Bool bCurrency : 1, // Waehrung - bAutoIncrement : 1, // Ist es ein automatisch incrementierendes Feld - bNullable : 1, // Kann das Feld NULL annehmen - bCaseSensitive : 1, // Ist der Type Casesensitive - bUnsigned : 1, // Ist der Type Unsigned - bEmpty_1 : 1, // for later use - bEmpty_2 : 1; + sal_Bool bCurrency : 1, // Waehrung + bAutoIncrement : 1, // Ist es ein automatisch incrementierendes Feld + bNullable : 1, // Kann das Feld NULL annehmen + bCaseSensitive : 1, // Ist der Type Casesensitive + bUnsigned : 1, // Ist der Type Unsigned + bEmpty_1 : 1, // for later use + bEmpty_2 : 1; OTypeInfo() :nPrecision(0) diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx index abfc1d107cb2..f62137a36d73 100644 --- a/connectivity/source/inc/ParameterSubstitution.hxx +++ b/connectivity/source/inc/ParameterSubstitution.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 @@ -47,7 +47,7 @@ namespace connectivity ParameterSubstitution( const ParameterSubstitution& ); ParameterSubstitution& operator=( const ParameterSubstitution& ); public: - + static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext); diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index f65539da3f77..bccad9ab06cc 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.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 @@ -41,11 +41,11 @@ namespace connectivity // ------------------------------------------------------------------------- struct OOO_DLLPUBLIC_DBTOOLS RowEquation { - sal_Int32 nOperation; - ORowSetValueDecoratorRef nPara[ 3 ]; + sal_Int32 nOperation; + ORowSetValueDecoratorRef nPara[ 3 ]; RowEquation() : - nOperation ( 0 ) + nOperation ( 0 ) { } }; @@ -101,10 +101,10 @@ class OOO_DLLPUBLIC_DBTOOLS FunctionParser public: /** Parse a string - + The following grammar is accepted by this method: <code> - + number_digit = '0'|'1'|'2'|'3'|'4'|'5'|'6'|'7'|'8'|'9' number = number number_digit | number_digit @@ -114,8 +114,8 @@ public: string_reference = 'a-z,A-Z,0-9' ' ' modifier_reference = '$' '0-9' ' ' - - basic_expression = + + basic_expression = number | string_reference | additive_expression equal_function additive_expression | @@ -123,7 +123,7 @@ public: ternary_function '(' additive_expression ',' additive_expression ', ' additive_expression ')' | '(' additive_expression ')' - </code> + </code> @param rFunction The string to parse @@ -136,7 +136,7 @@ public: static ExpressionNodeSharedPtr parseFunction( const ::rtl::OUString& _sFunction); private: - // disabled constructor/destructor, since this is + // disabled constructor/destructor, since this is // supposed to be a singleton FunctionParser(); diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index 92e974f508f8..d4efc561867c 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.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,30 +49,30 @@ namespace connectivity > OMetaConnection_BASE; typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions; - + class OOO_DLLPUBLIC_DBTOOLS OMetaConnection : public OMetaConnection_BASE { protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aConnectionInfo; - connectivity::OWeakRefArray m_aStatements; // vector containing a list + connectivity::OWeakRefArray m_aStatements; // vector containing a list // of all the Statement objects // for this Connection - ::rtl::OUString m_sURL; - rtl_TextEncoding m_nTextEncoding; // the encoding which is used for all text conversions - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > + ::rtl::OUString m_sURL; + rtl_TextEncoding m_nTextEncoding; // the encoding which is used for all text conversions + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; SharedResources m_aResources; public: - + static ::dbtools::OPropertyMap& getPropMap(); OMetaConnection(); inline rtl_TextEncoding getTextEncoding() const { return m_nTextEncoding; } - inline ::rtl::OUString getURL() const { return m_sURL; } - inline void setURL(const ::rtl::OUString& _rsUrl) { m_sURL = _rsUrl; } + inline ::rtl::OUString getURL() const { return m_sURL; } + inline void setURL(const ::rtl::OUString& _rsUrl) { m_sURL = _rsUrl; } void throwGenericSQLException( sal_uInt16 _nErrorResourceId,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xContext ); const SharedResources& getResources() const { return m_aResources;} @@ -83,7 +83,7 @@ namespace connectivity // OComponentHelper virtual void SAL_CALL disposing(void); - //XUnoTunnel + //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/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index 7fb815d21f50..d6b0dae8b697 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.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 @@ -41,7 +41,7 @@ namespace connectivity { typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions; class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase : - public comphelper::OBaseMutex, + public comphelper::OBaseMutex, public ::cppu::WeakImplHelper2< ::com::sun::star::sdbc::XDatabaseMetaData2, ::com::sun::star::lang::XEventListener> { @@ -75,8 +75,8 @@ namespace connectivity return _rCache.second; } protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> m_xListenerHelper; // forward the calls from the connection to me + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> m_xListenerHelper; // forward the calls from the connection to me virtual ~ODatabaseMetaDataBase(); @@ -96,12 +96,12 @@ namespace connectivity virtual sal_Int32 impl_getMaxStatements_throw( ) = 0; virtual sal_Int32 impl_getMaxTablesInSelect_throw( ) = 0; virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ) = 0; - + public: ODatabaseMetaDataBase(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo); - + // XDatabaseMetaData2 virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getConnectionInfo( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index b5fa33b5c493..4e9bb50586c7 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.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 { } static OKeyValue* createKeyValue(sal_Int32 nVal); - // static OKeyValue* createEmptyKeyValue(); + // static OKeyValue* createEmptyKeyValue(); inline void pushKey(const ORowSetValueDecoratorRef& _aValueRef) { @@ -64,12 +64,12 @@ namespace connectivity } inline void setValue(sal_Int32 nVal) { m_nValue = nVal; } - ::rtl::OUString getKeyString(::std::vector<ORowSetValueDecoratorRef>::size_type i) const + ::rtl::OUString getKeyString(::std::vector<ORowSetValueDecoratorRef>::size_type i) const { OSL_ENSURE(m_aKeys.size() > i,"Wrong index for KEyValue"); return m_aKeys[i]->getValue(); } - double getKeyDouble(::std::vector<ORowSetValueDecoratorRef>::size_type i) const + double getKeyDouble(::std::vector<ORowSetValueDecoratorRef>::size_type i) const { OSL_ENSURE(m_aKeys.size() > i,"Wrong index for KEyValue"); return m_aKeys[i]->getValue(); diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx index a02fde92e412..23e47cf56565 100644 --- a/connectivity/source/inc/TPrivilegesResultSet.hxx +++ b/connectivity/source/inc/TPrivilegesResultSet.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 @@ -37,9 +37,9 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OResultSetPrivileges : public ODatabaseMetaDataResultSet { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xTables; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; - sal_Bool m_bResetValues; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xTables; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; + sal_Bool m_bResetValues; protected: virtual const ORowSetValue& getValue(sal_Int32 columnIndex); public: diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx index 874b9d93d82b..8480dd9ab9f9 100644 --- a/connectivity/source/inc/TResultSetHelper.hxx +++ b/connectivity/source/inc/TResultSetHelper.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 public: enum Movement { - NEXT = 0, + NEXT = 0, PRIOR, FIRST, LAST, diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index e07d24e3ae96..ef2f4e504b41 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.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 @@ -41,11 +41,11 @@ namespace connectivity */ class OOO_DLLPUBLIC_DBTOOLS OSkipDeletedSet { - ::std::vector<sal_Int32> m_aBookmarksPositions;// vector of iterators to position map, the order is the logical position - IResultSetHelper* m_pHelper; // used for moving in the resultset + ::std::vector<sal_Int32> m_aBookmarksPositions;// vector of iterators to position map, the order is the logical position + IResultSetHelper* m_pHelper; // used for moving in the resultset bool m_bDeletedVisible; - sal_Bool moveAbsolute(sal_Int32 _nOffset,sal_Bool _bRetrieveData); + sal_Bool moveAbsolute(sal_Int32 _nOffset,sal_Bool _bRetrieveData); public: OSkipDeletedSet(IResultSetHelper* _pHelper); ~OSkipDeletedSet(); @@ -63,42 +63,42 @@ namespace connectivity skipDeleted moves the resultset to the position defined by the parameters it garantees that the row isn't deleted @param - IResultSetHelper::Movement _eCursorPosition in which direction the resultset should be moved - sal_Int32 _nOffset the position relativ to the movement - sal_Bool _bRetrieveData is true when the current row should be filled which data + IResultSetHelper::Movement _eCursorPosition in which direction the resultset should be moved + sal_Int32 _nOffset the position relativ to the movement + sal_Bool _bRetrieveData is true when the current row should be filled which data @return true when the movement was successful otherwise false */ - sal_Bool skipDeleted(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData); + sal_Bool skipDeleted(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData); /** clear the map and the vector used in this class */ - void clear(); + void clear(); /** getMappedPosition returns the mapped position of a logical position @param - sal_Int32 _nBookmark the logical position + sal_Int32 _nBookmark the logical position @return the mapped position */ - sal_Int32 getMappedPosition(sal_Int32 _nBookmark) const; + sal_Int32 getMappedPosition(sal_Int32 _nBookmark) const; /** insertNewPosition adds a new position to the map @param - sal_Int32 _nPos the logical position + sal_Int32 _nPos the logical position */ - void insertNewPosition(sal_Int32 _nPos); + void insertNewPosition(sal_Int32 _nPos); /** deletePosition deletes this position from the map and decrement all following positions @param - sal_Int32 _nPos the logical position + sal_Int32 _nPos the logical position */ - void deletePosition(sal_Int32 _nPos); + void deletePosition(sal_Int32 _nPos); /** getLastPosition returns the last position @return the last position */ - inline sal_Int32 getLastPosition() const { return m_aBookmarksPositions.size(); } + inline sal_Int32 getLastPosition() const { return m_aBookmarksPositions.size(); } inline void SetDeleted(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; } }; } diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index 21212bc90ce6..062946ac8dc6 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.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 @@ -35,19 +35,19 @@ namespace connectivity { typedef enum { - SQL_ORDERBYKEY_NONE, // do not sort - SQL_ORDERBYKEY_DOUBLE, // numeric key - SQL_ORDERBYKEY_STRING // String Key + SQL_ORDERBYKEY_NONE, // do not sort + SQL_ORDERBYKEY_DOUBLE, // numeric key + SQL_ORDERBYKEY_STRING // String Key } OKeyType; typedef enum { - SQL_ASC = 1, // ascending - SQL_DESC = -1 // otherwise + SQL_ASC = 1, // ascending + SQL_DESC = -1 // otherwise } TAscendingOrder; class OKeySet; - class OKeyValue; // simple class which holds a sal_Int32 and a ::std::vector<ORowSetValueDecoratorRef> + class OKeyValue; // simple class which holds a sal_Int32 and a ::std::vector<ORowSetValueDecoratorRef> /** The class OSortIndex can be used to implement a sorted index. @@ -56,18 +56,18 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OSortIndex { public: - typedef ::std::vector< ::std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; - typedef ::std::vector<OKeyType> TKeyTypeVector; + typedef ::std::vector< ::std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; + typedef ::std::vector<OKeyType> TKeyTypeVector; private: - TIntValuePairVector m_aKeyValues; - TKeyTypeVector m_aKeyType; + TIntValuePairVector m_aKeyValues; + TKeyTypeVector m_aKeyType; ::std::vector<TAscendingOrder> m_aAscending; - sal_Bool m_bFrozen; + sal_Bool m_bFrozen; public: - OSortIndex( const ::std::vector<OKeyType>& _aKeyType, + OSortIndex( const ::std::vector<OKeyType>& _aKeyType, const ::std::vector<TAscendingOrder>& _aAscending); ~OSortIndex(); @@ -85,7 +85,7 @@ namespace connectivity /** AddKeyValue appends a new value. @param - pKeyValue the keyvalue to be appended + pKeyValue the keyvalue to be appended ATTENTION: when the sortindex is already frozen the parameter will be deleted */ void AddKeyValue(OKeyValue * pKeyValue); @@ -106,7 +106,7 @@ namespace connectivity // look at the name sal_Bool IsFrozen() const { return m_bFrozen; } // returns the current size of the keyvalues - sal_Int32 Count() const { return m_aKeyValues.size(); } + sal_Int32 Count() const { return m_aKeyValues.size(); } /** GetValue returns the value at position nPos (1..n) [sorted access]. It only allowed to call this method after the sortindex has been frozen. */ @@ -133,8 +133,8 @@ namespace connectivity : ORefVector<sal_Int32>(_nSize) , m_bFrozen(sal_False){} - sal_Bool isFrozen() const { return m_bFrozen; } - void setFrozen(sal_Bool _bFrozen=sal_True) { m_bFrozen = _bFrozen; } + sal_Bool isFrozen() const { return m_bFrozen; } + void setFrozen(sal_Bool _bFrozen=sal_True) { m_bFrozen = _bFrozen; } }; } #endif // CONNECTIVITY_TSORTINDEX_HXX diff --git a/connectivity/source/inc/UStringDescription_Impl.hxx b/connectivity/source/inc/UStringDescription_Impl.hxx index 2c2c33d03175..8ac78d4924f8 100644 --- a/connectivity/source/inc/UStringDescription_Impl.hxx +++ b/connectivity/source/inc/UStringDescription_Impl.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 @@ -29,14 +29,14 @@ #ifndef CONNECTIVITY_USTRINGDESCRIPTION_IMPL_HXX #define CONNECTIVITY_USTRINGDESCRIPTION_IMPL_HXX -#define IMPLEMENT_CONSTASCII_USTRING(name) \ +#define IMPLEMENT_CONSTASCII_USTRING(name) \ UStringDescription name(connectivity::dbtools::get##name) UStringDescription::UStringDescription(PVFN _fCharFkt) -{ - pZeroTerminatedName = (*_fCharFkt)(); +{ + pZeroTerminatedName = (*_fCharFkt)(); nLength = 0; - const sal_Char* pIter = pZeroTerminatedName; + const sal_Char* pIter = pZeroTerminatedName; while((*pIter++) != '\0') ++nLength; } @@ -45,16 +45,16 @@ UStringDescription::~UStringDescription() { } -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_QUERYTIMEOUT ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXFIELDSIZE ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXROWS ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CURSORNAME ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETCONCURRENCY ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETTYPE ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHDIRECTION ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHSIZE ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING ); -IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USEBOOKMARKS ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_QUERYTIMEOUT ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXFIELDSIZE ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXROWS ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CURSORNAME ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETCONCURRENCY ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULTSETTYPE ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHDIRECTION ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FETCHSIZE ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPEPROCESSING ); +IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USEBOOKMARKS ); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NAME); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TYPE); @@ -99,7 +99,7 @@ IMPLEMENT_CONSTASCII_USTRING(ERRORMSG_SEQUENCE); IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_SEQUENCE); IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_GENERAL); //============================================================ -//= different +//= different //============================================================ IMPLEMENT_CONSTASCII_USTRING(STR_DELIMITER); diff --git a/connectivity/source/inc/adabas/BCatalog.hxx b/connectivity/source/inc/adabas/BCatalog.hxx index af411b825b5a..1480e078d412 100644 --- a/connectivity/source/inc/adabas/BCatalog.hxx +++ b/connectivity/source/inc/adabas/BCatalog.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 @@ -41,31 +41,31 @@ namespace connectivity class OAdabasConnection; class OAdabasCatalog : public connectivity::sdbcx::OCatalog { - OAdabasConnection* m_pConnection; // used to get the metadata - SQLHANDLE m_aConnectionHdl; // used for odbc specific stuff + OAdabasConnection* m_pConnection; // used to get the metadata + SQLHANDLE m_aConnectionHdl; // used for odbc specific stuff void fillVector(const ::rtl::OUString& _sQuery,TStringVector& _rVector); protected: /** 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 cuurent row from a call of XDatabaseMetaData::getTables. */ - 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); public: // implementation of the pure virtual methods virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; public: OAdabasCatalog(SQLHANDLE _aConnectionHdl,OAdabasConnection* _pCon); - OAdabasConnection* getConnection() const { return m_pConnection; } - sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + OAdabasConnection* getConnection() const { return m_pConnection; } + sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + sdbcx::OCollection* getPrivateViews() const { return m_pViews; } static const ::rtl::OUString& getDot(); // correct the the column properties of float/real/double values diff --git a/connectivity/source/inc/adabas/BColumn.hxx b/connectivity/source/inc/adabas/BColumn.hxx index 34afc908dedd..a310e1a4f6d8 100644 --- a/connectivity/source/inc/adabas/BColumn.hxx +++ b/connectivity/source/inc/adabas/BColumn.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,11 +42,11 @@ namespace connectivity OAdabasColumn(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_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); }; } diff --git a/connectivity/source/inc/adabas/BColumns.hxx b/connectivity/source/inc/adabas/BColumns.hxx index 40eadf3e9bf9..060569d839e2 100644 --- a/connectivity/source/inc/adabas/BColumns.hxx +++ b/connectivity/source/inc/adabas/BColumns.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 @@ -41,7 +41,7 @@ namespace connectivity class OColumns : public sdbcx::OCollection { protected: - OAdabasTable* m_pTable; + OAdabasTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); @@ -49,7 +49,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: - OColumns( OAdabasTable* _pTable, + OColumns( OAdabasTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector ) : sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector) diff --git a/connectivity/source/inc/adabas/BConnection.hxx b/connectivity/source/inc/adabas/BConnection.hxx index afa5cc300a72..5ecdde267f7c 100644 --- a/connectivity/source/inc/adabas/BConnection.hxx +++ b/connectivity/source/inc/adabas/BConnection.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,13 +46,13 @@ namespace connectivity // we must use the name "OAdabasConnection" because of a compiler bug - class OAdabasConnection : public OConnection_BASE2 + class OAdabasConnection : public OConnection_BASE2 { ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; protected: - virtual SQLRETURN openConnectionWithAuth(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, const ::rtl::OUString& _uid,const ::rtl::OUString& _pwd); - virtual connectivity::odbc::OConnection* cloneConnection(); // creates a new connection + virtual SQLRETURN openConnectionWithAuth(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, const ::rtl::OUString& _uid,const ::rtl::OUString& _pwd); + virtual connectivity::odbc::OConnection* cloneConnection(); // creates a new connection public: virtual SQLRETURN Construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); @@ -63,11 +63,11 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - //XUnoTunnel + //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/source/inc/adabas/BDatabaseMetaData.hxx b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx index b60551069d4e..9c2ba7edfe79 100644 --- a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx +++ b/connectivity/source/inc/adabas/BDatabaseMetaData.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/source/inc/adabas/BDriver.hxx b/connectivity/source/inc/adabas/BDriver.hxx index 82cbc0594a31..0b06028b9eb0 100644 --- a/connectivity/source/inc/adabas/BDriver.hxx +++ b/connectivity/source/inc/adabas/BDriver.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 @@ -59,28 +59,28 @@ namespace connectivity { typedef struct DatabaseStruct { - ::rtl::OUString sControlUser; - ::rtl::OUString sControlPassword; - ::rtl::OUString sSysUser; - ::rtl::OUString sSysPassword; - ::rtl::OUString sDomainPassword; + ::rtl::OUString sControlUser; + ::rtl::OUString sControlPassword; + ::rtl::OUString sSysUser; + ::rtl::OUString sSysPassword; + ::rtl::OUString sDomainPassword; ::rtl::OUString sCacheSize; ::rtl::OUString sBackupFile; ::rtl::OUString sDataDevName; ::rtl::OUString sSysDevSpace; ::rtl::OUString sTransLogName; ::rtl::OUString sDBName; - sal_Int32 nDataIncrement; // which size the database should grow - sal_Int32 nDataSize; - sal_Int32 nLogSize; - sal_Bool bShutDown; - sal_Bool bRestoreDatabase; + sal_Int32 nDataIncrement; // which size the database should grow + sal_Int32 nDataSize; + sal_Int32 nLogSize; + sal_Bool bShutDown; + sal_Bool bRestoreDatabase; DatabaseStruct() : nDataIncrement(0),nDataSize(0),nLogSize(0),bShutDown(sal_False),bRestoreDatabase(sal_False){ } } TDatabaseStruct; DECLARE_STL_USTRINGACCESS_MAP(TDatabaseStruct,TDatabaseMap); - TDatabaseMap m_aDatabaseMap; // contains all adabas databases with their flag to shut down or not + TDatabaseMap m_aDatabaseMap; // contains all adabas databases with their flag to shut down or not // environment vars ::rtl::OUString m_sDbWork; @@ -107,7 +107,7 @@ namespace connectivity void XUTIL(const ::rtl::OUString& _rParam, const ::rtl::OUString& _DBNAME, const ::rtl::OUString& _USRNAME, - const ::rtl::OUString& _USRPWD); + const ::rtl::OUString& _USRPWD); int X_STOP(const ::rtl::OUString& _DBNAME); int X_START(const ::rtl::OUString& _DBNAME); void createDb(const TDatabaseStruct& _aInfo); @@ -122,15 +122,15 @@ namespace connectivity void PutParam(const ::rtl::OUString& rDBNAME, const ::rtl::OUString& rWhat, const ::rtl::OUString& rHow); - void createNeededDirs( const ::rtl::OUString& _rDBName); + void createNeededDirs( const ::rtl::OUString& _rDBName); sal_Bool isKernelVersion(const char* _pVersion); - sal_Bool isVersion( const ::rtl::OUString& _rDBName, + sal_Bool isVersion( const ::rtl::OUString& _rDBName, const char* _pVersion); - void convertOldVersion( const ::rtl::OUString& _rDBName, + void convertOldVersion( const ::rtl::OUString& _rDBName, const TDatabaseStruct& _rDbInfo); - void installSystemTables( const TDatabaseStruct& _aInfo); + void installSystemTables( const TDatabaseStruct& _aInfo); protected: virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath); diff --git a/connectivity/source/inc/adabas/BGroup.hxx b/connectivity/source/inc/adabas/BGroup.hxx index 29a0486a7bc4..3f79fd745983 100644 --- a/connectivity/source/inc/adabas/BGroup.hxx +++ b/connectivity/source/inc/adabas/BGroup.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/source/inc/adabas/BGroups.hxx b/connectivity/source/inc/adabas/BGroups.hxx index 7989aaa4cbfd..832613e7e8e6 100644 --- a/connectivity/source/inc/adabas/BGroups.hxx +++ b/connectivity/source/inc/adabas/BGroups.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,8 +42,8 @@ namespace connectivity class OGroups : public sdbcx::OCollection { protected: - OAdabasConnection* m_pConnection; - connectivity::sdbcx::IRefreshableGroups* m_pParent; + OAdabasConnection* m_pConnection; + connectivity::sdbcx::IRefreshableGroups* m_pParent; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/adabas/BIndex.hxx b/connectivity/source/inc/adabas/BIndex.hxx index d089d0bd8d89..74e52681f16a 100644 --- a/connectivity/source/inc/adabas/BIndex.hxx +++ b/connectivity/source/inc/adabas/BIndex.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 connectivity class OAdabasTable; class OAdabasIndex : public sdbcx::OIndex { - OAdabasTable* m_pTable; + OAdabasTable* m_pTable; public: virtual void refreshColumns(); public: OAdabasIndex(OAdabasTable* _pTable); - OAdabasIndex( OAdabasTable* _pTable, + OAdabasIndex( OAdabasTable* _pTable, const ::rtl::OUString& _Name, const ::rtl::OUString& _Catalog, sal_Bool _isUnique, diff --git a/connectivity/source/inc/adabas/BIndexColumn.hxx b/connectivity/source/inc/adabas/BIndexColumn.hxx index 9b515053ad31..45fa0146f28e 100644 --- a/connectivity/source/inc/adabas/BIndexColumn.hxx +++ b/connectivity/source/inc/adabas/BIndexColumn.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,18 +38,18 @@ namespace connectivity class OIndexColumn : public OAdabasColumn { protected: - sal_Bool m_IsAscending; + sal_Bool m_IsAscending; public: OIndexColumn(); - OIndexColumn( sal_Bool _IsAscending, - const ::rtl::OUString& _Name, + 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_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); virtual void construct(); }; diff --git a/connectivity/source/inc/adabas/BIndexColumns.hxx b/connectivity/source/inc/adabas/BIndexColumns.hxx index 80274d098dc7..8ed56e03d2b4 100644 --- a/connectivity/source/inc/adabas/BIndexColumns.hxx +++ b/connectivity/source/inc/adabas/BIndexColumns.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 @@ -45,7 +45,7 @@ namespace connectivity virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); public: - OIndexColumns( OAdabasIndex* _pIndex, + OIndexColumns( OAdabasIndex* _pIndex, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(*_pIndex,sal_True,_rMutex,_rVector) diff --git a/connectivity/source/inc/adabas/BIndexes.hxx b/connectivity/source/inc/adabas/BIndexes.hxx index 451e4ef05e90..be9a975d8798 100644 --- a/connectivity/source/inc/adabas/BIndexes.hxx +++ b/connectivity/source/inc/adabas/BIndexes.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 @@ -37,7 +37,7 @@ namespace connectivity { class OIndexes : public sdbcx::OCollection { - OAdabasTable* m_pTable; + OAdabasTable* 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/source/inc/adabas/BKeys.hxx b/connectivity/source/inc/adabas/BKeys.hxx index 1ba5f9372532..155186067bd1 100644 --- a/connectivity/source/inc/adabas/BKeys.hxx +++ b/connectivity/source/inc/adabas/BKeys.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/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx index c74bf3a3f0cd..cbe73c0bd973 100644 --- a/connectivity/source/inc/adabas/BPreparedStatement.hxx +++ b/connectivity/source/inc/adabas/BPreparedStatement.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 @@ -35,14 +35,14 @@ namespace connectivity { namespace adabas { - class OAdabasPreparedStatement : public ::connectivity::odbc::OPreparedStatement + class OAdabasPreparedStatement : public ::connectivity::odbc::OPreparedStatement { - ::rtl::Reference<OSQLColumns> m_aSelectColumns; + ::rtl::Reference<OSQLColumns> m_aSelectColumns; protected: virtual odbc::OResultSet* createResulSet(); - virtual void setResultSetConcurrency(sal_Int32 _par0) ; - virtual void setResultSetType(sal_Int32 _par0) ; - virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; + virtual void setResultSetConcurrency(sal_Int32 _par0) ; + virtual void setResultSetType(sal_Int32 _par0) ; + virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; public: OAdabasPreparedStatement( OAdabasConnection* _pConnection,const ::rtl::OUString& sql); }; diff --git a/connectivity/source/inc/adabas/BResultSet.hxx b/connectivity/source/inc/adabas/BResultSet.hxx index 95a9a41eea84..64f5932d9fc9 100644 --- a/connectivity/source/inc/adabas/BResultSet.hxx +++ b/connectivity/source/inc/adabas/BResultSet.hxx @@ -34,9 +34,9 @@ namespace connectivity { namespace adabas { - class OAdabasResultSet : public ::connectivity::odbc::OResultSet + class OAdabasResultSet : public ::connectivity::odbc::OResultSet { - ::rtl::Reference<OSQLColumns> m_aSelectColumns; + ::rtl::Reference<OSQLColumns> m_aSelectColumns; public: OAdabasResultSet(SQLHANDLE _pStatementHandle,::connectivity::odbc::OStatement_Base* pStmt,const ::rtl::Reference<OSQLColumns>& _rSelectColumns) : ::connectivity::odbc::OResultSet( _pStatementHandle,pStmt) diff --git a/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx index 3fe11e02743d..16a4cdeab6a1 100644 --- a/connectivity/source/inc/adabas/BResultSetMetaData.hxx +++ b/connectivity/source/inc/adabas/BResultSetMetaData.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 @@ -40,12 +40,12 @@ namespace connectivity //************************************************************** typedef odbc::OResultSetMetaData OAdabasResultSetMetaData_BASE; - class OAdabasResultSetMetaData : public OAdabasResultSetMetaData_BASE + class OAdabasResultSetMetaData : public OAdabasResultSetMetaData_BASE { - ::rtl::Reference<OSQLColumns> m_aSelectColumns; + ::rtl::Reference<OSQLColumns> m_aSelectColumns; public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt ,const ::rtl::Reference<OSQLColumns>& _rSelectColumns); + OAdabasResultSetMetaData(odbc::OConnection* _pConnection, SQLHANDLE _pStmt ,const ::rtl::Reference<OSQLColumns>& _rSelectColumns); virtual ~OAdabasResultSetMetaData(); virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx index 6f92bacc6fc9..67f7a954c26d 100644 --- a/connectivity/source/inc/adabas/BStatement.hxx +++ b/connectivity/source/inc/adabas/BStatement.hxx @@ -37,14 +37,14 @@ namespace connectivity { namespace adabas { - class OAdabasStatement : public ::connectivity::odbc::OStatement + class OAdabasStatement : public ::connectivity::odbc::OStatement { - OAdabasConnection* m_pOwnConnection; - ::rtl::Reference<OSQLColumns> m_aSelectColumns; + OAdabasConnection* m_pOwnConnection; + ::rtl::Reference<OSQLColumns> m_aSelectColumns; protected: virtual odbc::OResultSet* createResulSet(); virtual void setResultSetConcurrency(sal_Int32 _par0); - virtual void setResultSetType(sal_Int32 _par0) ; + virtual void setResultSetType(sal_Int32 _par0) ; virtual void setUsingBookmarks(sal_Bool _bUseBookmark); public: OAdabasStatement( OAdabasConnection* _pConnection) diff --git a/connectivity/source/inc/adabas/BTable.hxx b/connectivity/source/inc/adabas/BTable.hxx index 7dde9b69d2a9..520627b0806d 100644 --- a/connectivity/source/inc/adabas/BTable.hxx +++ b/connectivity/source/inc/adabas/BTable.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 @@ -47,27 +47,27 @@ namespace connectivity OAdabasConnection* m_pConnection; protected: /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames); /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames); /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames); public: - OAdabasTable( sdbcx::OCollection* _pTables, + OAdabasTable( sdbcx::OCollection* _pTables, OAdabasConnection* _pConnection); - OAdabasTable( sdbcx::OCollection* _pTables, + OAdabasTable( sdbcx::OCollection* _pTables, OAdabasConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/inc/adabas/BTables.hxx b/connectivity/source/inc/adabas/BTables.hxx index 98aae92abfd0..cd80f95e9cfc 100644 --- a/connectivity/source/inc/adabas/BTables.hxx +++ b/connectivity/source/inc/adabas/BTables.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 @@ -37,7 +37,7 @@ namespace connectivity class OTables : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - // OCatalog* m_pParent; + // OCatalog* m_pParent; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/adabas/BUser.hxx b/connectivity/source/inc/adabas/BUser.hxx index da336939f071..bff6c6b5f1ff 100644 --- a/connectivity/source/inc/adabas/BUser.hxx +++ b/connectivity/source/inc/adabas/BUser.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 @@ -67,7 +67,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + ::rtl::OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/adabas/BUsers.hxx b/connectivity/source/inc/adabas/BUsers.hxx index df4915cf4fb2..9a6b7713024f 100644 --- a/connectivity/source/inc/adabas/BUsers.hxx +++ b/connectivity/source/inc/adabas/BUsers.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,7 +42,7 @@ namespace connectivity class OUsers : public sdbcx::OCollection { OAdabasConnection* m_pConnection; - connectivity::sdbcx::IRefreshableUsers* m_pParent; + connectivity::sdbcx::IRefreshableUsers* m_pParent; public: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); diff --git a/connectivity/source/inc/adabas/BViews.hxx b/connectivity/source/inc/adabas/BViews.hxx index 751726eed72a..51df106960e8 100644 --- a/connectivity/source/inc/adabas/BViews.hxx +++ b/connectivity/source/inc/adabas/BViews.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 { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; sal_Bool m_bInDrop; - // OCatalog* m_pParent; + // OCatalog* m_pParent; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx index 00398698ea13..25e41f4bb770 100644 --- a/connectivity/source/inc/ado/ACallableStatement.hxx +++ b/connectivity/source/inc/ado/ACallableStatement.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,11 +42,11 @@ namespace connectivity //************ Class: java.sql.CallableStatement //************************************************************** - class OCallableStatement : public OPreparedStatement, + class OCallableStatement : public OPreparedStatement, public ::com::sun::star::sdbc::XRow, public ::com::sun::star::sdbc::XOutParameters { - OLEVariant m_aValue; + OLEVariant m_aValue; public: DECLARE_SERVICE_INFO(); virtual ~OCallableStatement() {} ; diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx index 4ac4a7ef4394..7fb8f30f5fb7 100644 --- a/connectivity/source/inc/ado/ACatalog.hxx +++ b/connectivity/source/inc/ado/ACatalog.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,22 +39,22 @@ namespace connectivity class OCatalog : public connectivity::sdbcx::OCatalog { - WpADOCatalog m_aCatalog; - OConnection* m_pConnection; + WpADOCatalog m_aCatalog; + OConnection* m_pConnection; public: virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; public: OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon); ~OCatalog(); - OConnection* getConnection() const { return m_pConnection; } - sdbcx::OCollection* getPrivateTables() const { return m_pTables; } - WpADOCatalog getCatalog() const { return m_aCatalog; } + OConnection* getConnection() const { return m_pConnection; } + sdbcx::OCollection* getPrivateTables() const { return m_pTables; } + WpADOCatalog getCatalog() const { return m_aCatalog; } }; } } diff --git a/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx index 485a151ca4a8..a31986512e75 100644 --- a/connectivity/source/inc/ado/ACollection.hxx +++ b/connectivity/source/inc/ado/ACollection.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 @@ -40,30 +40,30 @@ namespace connectivity { namespace ado { - namespace starcontainer = ::com::sun::star::container; - namespace starlang = ::com::sun::star::lang; - namespace staruno = ::com::sun::star::uno; - namespace starbeans = ::com::sun::star::beans; + namespace starcontainer = ::com::sun::star::container; + namespace starlang = ::com::sun::star::lang; + namespace staruno = ::com::sun::star::uno; + namespace starbeans = ::com::sun::star::beans; typedef ::cppu::WeakImplHelper3< starcontainer::XNameAccess, starcontainer::XIndexAccess, starlang::XServiceInfo> OCollectionBase; //************************************************************ - // OCollection + // OCollection //************************************************************ template <class T,class SimT,class OCl> class OCollection : public OCollectionBase { private: - OCollection( const OCollection& ); // never implemented - OCollection& operator=( const OCollection& ); // never implemented - - protected: - vector<OCl*> m_aElements; - ::cppu::OWeakObject& m_rParent; - ::osl::Mutex& m_rMutex; // mutex of the parent - T* m_pCollection; + OCollection( const OCollection& ); // never implemented + OCollection& operator=( const OCollection& ); // never implemented + protected: + vector<OCl*> m_aElements; + ::cppu::OWeakObject& m_rParent; + ::osl::Mutex& m_rMutex; // mutex of the parent + T* m_pCollection; + public: OCollection(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,T* _pCollection) @@ -90,7 +90,7 @@ namespace connectivity for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) if (pSupported->equals(_rServiceName)) return sal_True; - + return sal_False; } virtual staruno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(staruno::RuntimeException) @@ -115,13 +115,13 @@ namespace connectivity { return::getCppuType(static_cast< staruno::Reference< starbeans::XPropertySet>*>(NULL)); } - + virtual sal_Bool SAL_CALL hasElements( ) throw(staruno::RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); return getCount() > 0; } - + // starcontainer::XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(staruno::RuntimeException) { @@ -153,7 +153,7 @@ namespace connectivity virtual staruno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - + SimT* pCol = NULL; m_pCollection->get_Item(OLEVariant(aName),&pCol); if(!pCol) @@ -179,7 +179,7 @@ namespace connectivity SimT* pIdx = NULL; m_pCollection->get_Item(aVar,&pIdx); pIdx->AddRef(); - _bstr_t sBSTR; + _bstr_t sBSTR; pIdx->get_Name(&sBSTR); (*pStringArray) = (sal_Unicode*)sBSTR; pIdx->Release(); @@ -216,13 +216,13 @@ namespace connectivity class OGroup; class OUser; - typedef OCollection< ADOIndexes,ADOIndex,OIndex> OIndexes; - typedef OCollection< ADOKeys,ADOKey,OKey> OKeys; - typedef OCollection< ADOColumns,ADOColumn,OColumn> OColumns; - typedef OCollection< ADOTables,ADOTable,OTable> OTables; - typedef OCollection< ADOViews,ADOView,OView> OViews; - typedef OCollection< ADOGroups,ADOGroup,OGroup> OGroups; - typedef OCollection< ADOUsers,ADOUser,OUser> OUsers; + typedef OCollection< ADOIndexes,ADOIndex,OIndex> OIndexes; + typedef OCollection< ADOKeys,ADOKey,OKey> OKeys; + typedef OCollection< ADOColumns,ADOColumn,OColumn> OColumns; + typedef OCollection< ADOTables,ADOTable,OTable> OTables; + typedef OCollection< ADOViews,ADOView,OView> OViews; + typedef OCollection< ADOGroups,ADOGroup,OGroup> OGroups; + typedef OCollection< ADOUsers,ADOUser,OUser> OUsers; } } diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx index ce93f201aef1..62a2b101e88e 100644 --- a/connectivity/source/inc/ado/AColumn.hxx +++ b/connectivity/source/inc/ado/AColumn.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 @@ -40,10 +40,10 @@ namespace connectivity typedef sdbcx::OColumn OColumn_ADO; class OAdoColumn : public OColumn_ADO { - WpADOColumn m_aColumn; - OConnection* m_pConnection; - ::rtl::OUString m_ReferencedColumn; - sal_Bool m_IsAscending; + WpADOColumn m_aColumn; + OConnection* m_pConnection; + ::rtl::OUString m_ReferencedColumn; + sal_Bool m_IsAscending; void fillPropertyValues(); protected: @@ -63,7 +63,7 @@ namespace connectivity 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(); - WpADOColumn getColumnImpl() const; + WpADOColumn getColumnImpl() const; }; } } diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx index 6f8867ec0fb4..4486a572717c 100644 --- a/connectivity/source/inc/ado/AColumns.hxx +++ b/connectivity/source/inc/ado/AColumns.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,8 +42,8 @@ namespace connectivity class OColumns : public sdbcx::OCollection { protected: - WpADOColumns m_aCollection; - OConnection* m_pConnection; + WpADOColumns m_aCollection; + OConnection* m_pConnection; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); @@ -51,10 +51,10 @@ 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: - OColumns( ::cppu::OWeakObject& _rParent, + OColumns( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const WpADOColumns& _rCollection, + const WpADOColumns& _rCollection, sal_Bool _bCase, OConnection* _pConnection) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 4be35ae52fff..aa170e87a2fb 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.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,8 +44,8 @@ namespace connectivity { struct OExtendedTypeInfo { - ::connectivity::OTypeInfo aSimpleType; // the general type info - DataTypeEnum eType; + ::connectivity::OTypeInfo aSimpleType; // the general type info + DataTypeEnum eType; inline ::rtl::OUString getDBName() const { return aSimpleType.aTypeName; } }; @@ -53,8 +53,8 @@ namespace connectivity class WpADOConnection; class ODriver; class OCatalog; - typedef ::std::multimap<DataTypeEnum, OExtendedTypeInfo*> OTypeInfoMap; - typedef connectivity::OMetaConnection OConnection_BASE; + typedef ::std::multimap<DataTypeEnum, OExtendedTypeInfo*> OTypeInfoMap; + typedef connectivity::OMetaConnection OConnection_BASE; class OConnection : public OConnection_BASE, @@ -66,24 +66,24 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - OTypeInfoMap m_aTypeInfo; // vector containing an entry + OTypeInfoMap m_aTypeInfo; // vector containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; - ODriver* m_pDriver; + ODriver* m_pDriver; private: - WpADOConnection* m_pAdoConnection; - OCatalog* m_pCatalog; - sal_Int32 m_nEngineType; - sal_Bool m_bClosed; - sal_Bool m_bAutocommit; + WpADOConnection* m_pAdoConnection; + OCatalog* m_pCatalog; + sal_Int32 m_nEngineType; + sal_Bool m_bClosed; + sal_Bool m_bAutocommit; protected: void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException); public: OConnection(ODriver* _pDriver) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // OConnection(const SQLHANDLE _pConnectionHandle); + // OConnection(const SQLHANDLE _pConnectionHandle); ~OConnection(); void construct(const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info); @@ -136,8 +136,8 @@ namespace connectivity return NULL; } - sal_Int32 getEngineType() const { return m_nEngineType; } - ODriver* getDriver() const { return m_pDriver; } + sal_Int32 getEngineType() const { return m_nEngineType; } + ODriver* getDriver() const { return m_pDriver; } static const OExtendedTypeInfo* getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, DataTypeEnum _nType, diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx index d2e6fe645f5d..2e8dab649f20 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaData.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 @@ -47,16 +47,16 @@ namespace connectivity class ODatabaseMetaData : public ODatabaseMetaDataBase { - typedef struct _LiteralInfo + typedef struct _LiteralInfo { ::rtl::OUString pwszLiteralValue; - sal_uInt32 cchMaxLen; + sal_uInt32 cchMaxLen; sal_Bool fSupported; } LiteralInfo; - ::std::map<sal_uInt32,LiteralInfo> m_aLiteralInfo; - WpADOConnection* m_pADOConnection; - OConnection* m_pConnection; + ::std::map<sal_uInt32,LiteralInfo> m_aLiteralInfo; + WpADOConnection* m_pADOConnection; + OConnection* m_pConnection; void fillLiterals(); // get information out of rowset @@ -110,10 +110,10 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index 4ac87c6ff7aa..fd0d4770736e 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.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,9 +50,9 @@ namespace connectivity { class ODatabaseMetaDataResultSetMetaData; /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, + typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::util::XCancellable, @@ -60,42 +60,42 @@ namespace connectivity ::com::sun::star::sdbc::XCloseable, ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; - class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, - public ODatabaseMetaDataResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> + class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, + public ODatabaseMetaDataResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime - ::std::map<sal_Int32, TInt2IntMap > m_aValueRange; - ::std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter; + ::std::map<sal_Int32, TInt2IntMap > m_aValueRange; + ::std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter; - ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> > m_aStrValueRange; - ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> >::iterator m_aStrValueRangeIter; + ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> > m_aStrValueRange; + ::std::map<sal_Int32, ::std::map< ::rtl::OUString,sal_Int32> >::iterator m_aStrValueRangeIter; - ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> > m_aIntValueRange; - ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> >::iterator m_aIntValueRangeIter; + ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> > m_aIntValueRange; + ::std::map<sal_Int32, ::std::map< sal_Int32,::rtl::OUString> >::iterator m_aIntValueRangeIter; - ADORecordset* m_pRecordSet; + ADORecordset* m_pRecordSet; ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - OLEVariant m_aValue; - sal_Int32 m_nRowPos; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; - sal_Bool m_bOnFirstAfterOpen; + OLEVariant m_aValue; + sal_Int32 m_nRowPos; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; + sal_Bool m_bOnFirstAfterOpen; sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - inline sal_Int32 mapColumn (sal_Int32 column); + inline sal_Int32 mapColumn (sal_Int32 column); void checkRecordSet() throw(::com::sun::star::sdbc::SQLException); OLEVariant getValue(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -206,9 +206,9 @@ namespace connectivity void setTypeInfoMap(sal_Bool _bJetEngine); }; // ------------------------------------------------------------------------- - inline sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) + inline sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) { - sal_Int32 map = column; + sal_Int32 map = column; if (!m_aColMapping.empty()) { diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index fadbde55724e..0f43f47826dc 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.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 @@ -47,20 +47,20 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; - class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE + class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { friend class ODatabaseMetaDataResultSet; const ::std::vector<sal_Int32> &m_vMapping; // when not every column is needed - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; + ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; - ADORecordset* m_pRecordSet; - sal_Int32 m_nColCount; + ADORecordset* m_pRecordSet; + sal_Int32 m_nColCount; private: - ODatabaseMetaDataResultSetMetaData( const ODatabaseMetaDataResultSetMetaData& ); // never implemented - ODatabaseMetaDataResultSetMetaData& operator=( const ODatabaseMetaDataResultSetMetaData& ); // never implemented + ODatabaseMetaDataResultSetMetaData( const ODatabaseMetaDataResultSetMetaData& ); // never implemented + ODatabaseMetaDataResultSetMetaData& operator=( const ODatabaseMetaDataResultSetMetaData& ); // never implemented protected: void setColumnPrivilegesMap(); @@ -76,7 +76,7 @@ namespace connectivity public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSetMetaData( ADORecordset* _pRecordSet ,ODatabaseMetaDataResultSet* _pRes) - : m_pRecordSet(_pRecordSet),m_vMapping(_pRes->getColumnMapping()), + : m_pRecordSet(_pRecordSet),m_vMapping(_pRes->getColumnMapping()), m_nColCount(m_vMapping.size()-1) { if(m_pRecordSet) diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index 1efc9580ba35..c8ff6e06da61 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.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,9 +48,9 @@ namespace connectivity > ODriver_BASE; class ODriver : public ODriver_BASE { - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; - connectivity::OWeakRefArray m_xConnections; // vector containing a list + connectivity::OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx index 7efe1650a89f..82401b55ef2e 100644 --- a/connectivity/source/inc/ado/AGroup.hxx +++ b/connectivity/source/inc/ado/AGroup.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,14 +39,14 @@ namespace connectivity typedef sdbcx::OGroup OGroup_ADO; class OCatalog; - class OAdoGroup : public OGroup_ADO + class OAdoGroup : public OGroup_ADO { - WpADOGroup m_aGroup; - OCatalog* m_pCatalog; + WpADOGroup m_aGroup; + OCatalog* m_pCatalog; - sal_Int32 MapRight(RightsEnum _eNum); - RightsEnum Map2Right(sal_Int32 _eNum); - ObjectTypeEnum MapObjectType(sal_Int32 _ObjType); + sal_Int32 MapRight(RightsEnum _eNum); + RightsEnum Map2Right(sal_Int32 _eNum); + ObjectTypeEnum MapObjectType(sal_Int32 _ObjType); protected: virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue,sal_Int32 nHandle) const; virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue)throw (::com::sun::star::uno::Exception); diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx index 13808a8e0607..b204a7115c57 100644 --- a/connectivity/source/inc/ado/AGroups.hxx +++ b/connectivity/source/inc/ado/AGroups.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,8 +44,8 @@ namespace connectivity class OAdabasConnection; class OGroups : public sdbcx::OCollection { - WpADOGroups m_aCollection; - OCatalog* m_pCatalog; + WpADOGroups m_aCollection; + OCatalog* m_pCatalog; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); @@ -57,7 +57,7 @@ namespace connectivity OGroups(OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const WpADOGroups& _rCollection,sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) + const WpADOGroups& _rCollection,sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) { diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx index e21d05b990ba..77a994d739bd 100644 --- a/connectivity/source/inc/ado/AIndex.hxx +++ b/connectivity/source/inc/ado/AIndex.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 @@ -40,10 +40,10 @@ namespace connectivity typedef sdbcx::OIndex OIndex_ADO; class OConnection; - class OAdoIndex : public OIndex_ADO + class OAdoIndex : public OIndex_ADO { - WpADOIndex m_aIndex; - OConnection* m_pConnection; + WpADOIndex m_aIndex; + OConnection* m_pConnection; protected: void fillPropertyValues(); virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue)throw (::com::sun::star::uno::Exception); @@ -52,13 +52,13 @@ namespace connectivity public: virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - OAdoIndex(sal_Bool _bCase, OConnection* _pConnection,ADOIndex* _pIndex); - OAdoIndex(sal_Bool _bCase, OConnection* _pConnection); + OAdoIndex(sal_Bool _bCase, OConnection* _pConnection,ADOIndex* _pIndex); + OAdoIndex(sal_Bool _bCase, OConnection* _pConnection); // 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(); - WpADOIndex getImpl() const { return m_aIndex;} + WpADOIndex getImpl() const { return m_aIndex;} }; } } diff --git a/connectivity/source/inc/ado/AIndexColumn.hxx b/connectivity/source/inc/ado/AIndexColumn.hxx index 9d2057bbf565..ddf9e3ebfd81 100644 --- a/connectivity/source/inc/ado/AIndexColumn.hxx +++ b/connectivity/source/inc/ado/AIndexColumn.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,18 +38,18 @@ namespace connectivity class OIndexColumn : public OAdoColumn { protected: - sal_Bool m_IsAscending; + sal_Bool m_IsAscending; public: OIndexColumn(); - OIndexColumn( sal_Bool _IsAscending, - const ::rtl::OUString& _Name, + 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_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); virtual void construct(); }; diff --git a/connectivity/source/inc/ado/AIndexColumns.hxx b/connectivity/source/inc/ado/AIndexColumns.hxx index be58ffb6f2b0..e7f667bd7d9a 100644 --- a/connectivity/source/inc/ado/AIndexColumns.hxx +++ b/connectivity/source/inc/ado/AIndexColumns.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 @@ -41,11 +41,11 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< starcontainer::XNamed > createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< starbeans::XPropertySet > createDescriptor(); public: - OIndexColumns( ::cppu::OWeakObject& _rParent, + OIndexColumns( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, OTable* _pTable, - connectivity::sdbcx::IRefreshableColumns* _pParent) + connectivity::sdbcx::IRefreshableColumns* _pParent) : OColumns(_rParent,_rMutex,_rVector,_pTable,_pParent) { } diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx index 345c9ce8176d..454ac6493536 100644 --- a/connectivity/source/inc/ado/AIndexes.hxx +++ b/connectivity/source/inc/ado/AIndexes.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,8 +39,8 @@ namespace connectivity class OConnection; class OIndexes : public sdbcx::OCollection { - WpADOIndexes m_aCollection; - OConnection* m_pConnection; + WpADOIndexes m_aCollection; + OConnection* m_pConnection; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); @@ -51,9 +51,9 @@ namespace connectivity OIndexes(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const WpADOIndexes& _rCollection, + const WpADOIndexes& _rCollection, sal_Bool _bCase, - OConnection* _pConnection) + OConnection* _pConnection) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) , m_aCollection(_rCollection) , m_pConnection(_pConnection) diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx index ad4dbada2b12..8c37ff532b29 100644 --- a/connectivity/source/inc/ado/AKey.hxx +++ b/connectivity/source/inc/ado/AKey.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,8 +42,8 @@ namespace connectivity class OConnection; class OAdoKey : public OKey_ADO { - WpADOKey m_aKey; - OConnection* m_pConnection; + WpADOKey m_aKey; + OConnection* m_pConnection; protected: void fillPropertyValues(); virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue)throw (::com::sun::star::uno::Exception); @@ -59,7 +59,7 @@ namespace connectivity 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(); - WpADOKey getImpl() const { return m_aKey;} + WpADOKey getImpl() const { return m_aKey;} // map the update/delete rules static RuleEnum Map2Rule(const sal_Int32& _eNum); static sal_Int32 MapRule(const RuleEnum& _eNum); diff --git a/connectivity/source/inc/ado/AKeyColumn.hxx b/connectivity/source/inc/ado/AKeyColumn.hxx index 098a4b36e0f8..64f20668a282 100644 --- a/connectivity/source/inc/ado/AKeyColumn.hxx +++ b/connectivity/source/inc/ado/AKeyColumn.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,18 +38,18 @@ namespace connectivity class OKeyColumn : public OAdoColumn { protected: - ::rtl::OUString m_ReferencedColumn; + ::rtl::OUString m_ReferencedColumn; public: OKeyColumn(); - OKeyColumn( const ::rtl::OUString& _ReferencedColumn, - const ::rtl::OUString& _Name, + 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_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); virtual void construct(); }; diff --git a/connectivity/source/inc/ado/AKeyColumns.hxx b/connectivity/source/inc/ado/AKeyColumns.hxx index 40873d2e252e..0041d6c57835 100644 --- a/connectivity/source/inc/ado/AKeyColumns.hxx +++ b/connectivity/source/inc/ado/AKeyColumns.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 @@ -41,11 +41,11 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< starcontainer::XNamed > createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< starbeans::XPropertySet > createDescriptor(); public: - OKeyColumns( ::cppu::OWeakObject& _rParent, + OKeyColumns( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, OTable* _pTable, - connectivity::sdbcx::IRefreshableColumns* _pParent) + connectivity::sdbcx::IRefreshableColumns* _pParent) : OColumns(_rParent,_rMutex,_rVector,_pTable,_pParent) { } diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx index 03991d0345ba..24f75394878d 100644 --- a/connectivity/source/inc/ado/AKeys.hxx +++ b/connectivity/source/inc/ado/AKeys.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,8 +39,8 @@ namespace connectivity class OConnection; class OKeys : public sdbcx::OCollection { - WpADOKeys m_aCollection; - OConnection* m_pConnection; + WpADOKeys m_aCollection; + OConnection* m_pConnection; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx index 33f504349679..b195184225be 100644 --- a/connectivity/source/inc/ado/APreparedStatement.hxx +++ b/connectivity/source/inc/ado/APreparedStatement.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 @@ -34,7 +34,7 @@ #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> +// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -45,7 +45,7 @@ namespace connectivity namespace ado { - class OPreparedStatement : public OStatement_Base, + class OPreparedStatement : public OStatement_Base, public ::com::sun::star::sdbc::XPreparedStatement, public ::com::sun::star::sdbc::XParameters, public ::com::sun::star::sdbc::XPreparedBatchExecution, @@ -55,16 +55,16 @@ namespace connectivity { void setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType,const sal_Int32& _nSize,const OLEVariant& _Val) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void replaceParameterNodeName( OSQLParseNode* _pNode, + void replaceParameterNodeName( OSQLParseNode* _pNode, const ::rtl::OUString& _sDefaultName, sal_Int32& _nParameterCount); protected: //==================================================================== // Data attributes //==================================================================== - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; - const OTypeInfoMap& m_aTypeInfo; - ADOParameters* m_pParameters; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + const OTypeInfoMap& m_aTypeInfo; + ADOParameters* m_pParameters; virtual ~OPreparedStatement(); diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index 3f16d080d83a..2136c0b25515 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.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 @@ -52,7 +52,7 @@ namespace connectivity { class OResultSetMetaData; /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -67,22 +67,22 @@ namespace connectivity ::com::sun::star::sdbcx::XDeleteRows, ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; - class OResultSet : public comphelper::OBaseMutex, - public OResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + class OResultSet : public comphelper::OBaseMutex, + public OResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { - ADORecordset* m_pRecordSet; - OStatement_Base* m_pStmt; + ADORecordset* m_pRecordSet; + OStatement_Base* m_pStmt; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - ::std::vector<OLEVariant> m_aBookmarks; - OLEVariant m_aValue; - sal_Int32 m_nRowPos; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; - sal_Bool m_bOnFirstAfterOpen; + ::std::vector<OLEVariant> m_aBookmarks; + OLEVariant m_aValue; + sal_Int32 m_nRowPos; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; + sal_Bool m_bOnFirstAfterOpen; sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx index 535e333f5c25..16c118a1b062 100644 --- a/connectivity/source/inc/ado/AResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/AResultSetMetaData.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,17 +48,17 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; - class OResultSetMetaData : public OResultSetMetaData_BASE + class OResultSetMetaData : public OResultSetMetaData_BASE { friend class OResultSet; - ADORecordset* m_pRecordSet; - sal_Int32 m_nColCount; + ADORecordset* m_pRecordSet; + sal_Int32 m_nColCount; sal_Int32 MapADOType2Jdbc(DataTypeEnum eType); private: - OResultSetMetaData( const OResultSetMetaData& ); // never implemented - OResultSetMetaData& operator=( const OResultSetMetaData& ); // never implemented + OResultSetMetaData( const OResultSetMetaData& ); // never implemented + OResultSetMetaData& operator=( const OResultSetMetaData& ); // never implemented protected: virtual ~OResultSetMetaData(); diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 0f04f00a73a6..841bcfddc983 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.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 @@ -60,36 +60,36 @@ namespace connectivity //************************************************************** //************ Class: java.sql.Statement //************************************************************** - class OStatement_Base : public comphelper::OBaseMutex, - public OStatement_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>, + class OStatement_Base : public comphelper::OBaseMutex, + public OStatement_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>, public connectivity::OSubComponent<OStatement_Base, OStatement_BASE> { friend class connectivity::OSubComponent<OStatement_Base, OStatement_BASE>; friend class OResultSet; - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; + ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< ::rtl::OUString> m_aBatchList; + ::std::list< ::rtl::OUString> m_aBatchList; ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created // for this Statement - OConnection* m_pConnection;// The owning Connection object - WpADOCommand m_Command; - WpADORecordset m_RecordSet; - OLEVariant m_RecordsAffected; - OLEVariant m_Parameters; - ::std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry + OConnection* m_pConnection;// The owning Connection object + WpADOCommand m_Command; + WpADORecordset m_RecordSet; + OLEVariant m_RecordsAffected; + OLEVariant m_Parameters; + ::std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. - sal_Int32 m_nMaxRows; - sal_Int32 m_nFetchSize; - LockTypeEnum m_eLockType; - CursorTypeEnum m_eCursorType; + sal_Int32 m_nMaxRows; + sal_Int32 m_nFetchSize; + LockTypeEnum m_eLockType; + CursorTypeEnum m_eCursorType; using OStatement_BASE::rBHelper; private: @@ -177,7 +177,7 @@ namespace connectivity virtual sal_Bool SAL_CALL getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; - class OStatement : public OStatement_Base, + class OStatement : public OStatement_Base, public ::com::sun::star::sdbc::XBatchExecution, public ::com::sun::star::lang::XServiceInfo { diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx index afa740ad5427..6c5e1b16bbda 100644 --- a/connectivity/source/inc/ado/ATable.hxx +++ b/connectivity/source/inc/ado/ATable.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 @@ -40,15 +40,15 @@ namespace connectivity typedef connectivity::sdbcx::OTable OTable_TYPEDEF; typedef connectivity::sdbcx::OTableDescriptor_BASE OTableDescriptor_BASE_TYPEDEF; - class OAdoTable : public OTable_TYPEDEF + class OAdoTable : public OTable_TYPEDEF { - WpADOTable m_aTable; - OCatalog* m_pCatalog; + WpADOTable m_aTable; + OCatalog* m_pCatalog; protected: void fillPropertyValues(); virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue)throw (::com::sun::star::uno::Exception); - + public: virtual void refreshColumns(); virtual void refreshKeys(); @@ -60,7 +60,7 @@ namespace connectivity public: OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable); OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog); - + virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); ::rtl::OUString getSchema() const { return m_SchemaName; } diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx index 1548cd34f7f5..ac2e0b94079e 100644 --- a/connectivity/source/inc/ado/ATables.hxx +++ b/connectivity/source/inc/ado/ATables.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,8 +39,8 @@ namespace connectivity class OCatalog; class OTables : public sdbcx::OCollection { - WpADOTables m_aCollection; - OCatalog* m_pCatalog; + WpADOTables m_aCollection; + OCatalog* m_pCatalog; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx index 922d9529c2e4..8595c075e9f7 100644 --- a/connectivity/source/inc/ado/AUser.hxx +++ b/connectivity/source/inc/ado/AUser.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,8 +43,8 @@ namespace connectivity class OAdoUser : public OUser_TYPEDEF { protected: - WpADOUser m_aUser; - OCatalog* m_pCatalog; + WpADOUser m_aUser; + OCatalog* m_pCatalog; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, @@ -58,7 +58,7 @@ namespace connectivity public: virtual void refreshGroups(); public: - OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser=NULL); + OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser=NULL); OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name); // com::sun::star::lang::XUnoTunnel @@ -85,7 +85,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + ::rtl::OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx index 8e8c79d231cb..77aa4504bf1d 100644 --- a/connectivity/source/inc/ado/AUsers.hxx +++ b/connectivity/source/inc/ado/AUsers.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,8 +44,8 @@ namespace connectivity class OUsers : public sdbcx::OCollection { - WpADOUsers m_aCollection; - OCatalog* m_pCatalog; + WpADOUsers m_aCollection; + OCatalog* m_pCatalog; public: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); @@ -56,8 +56,8 @@ namespace connectivity OUsers( OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const WpADOUsers& _rCollection, - sal_Bool _bCase) + const WpADOUsers& _rCollection, + sal_Bool _bCase) :sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx index 4ca8b51b6a2f..8ec340608c4b 100644 --- a/connectivity/source/inc/ado/AView.hxx +++ b/connectivity/source/inc/ado/AView.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,9 +39,9 @@ namespace connectivity typedef sdbcx::OView OView_ADO; - class OAdoView : public OView_ADO + class OAdoView : public OView_ADO { - WpADOView m_aView; + WpADOView m_aView; protected: // OPropertySetHelper diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx index 78a4f16134d0..27a7bebb36a9 100644 --- a/connectivity/source/inc/ado/AViews.hxx +++ b/connectivity/source/inc/ado/AViews.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 @@ -41,8 +41,8 @@ namespace connectivity class OViews : public sdbcx::OCollection { - WpADOViews m_aCollection; - OCatalog* m_pCatalog; + WpADOViews m_aCollection; + OCatalog* m_pCatalog; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx index fd343f32df61..7efda7a2f06f 100644 --- a/connectivity/source/inc/ado/Aolevariant.hxx +++ b/connectivity/source/inc/ado/Aolevariant.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,20 +79,20 @@ namespace connectivity sal_Int32 length() const; }; - class OLEVariant : public ::tagVARIANT + class OLEVariant : public ::tagVARIANT { public: OLEVariant(); OLEVariant(const VARIANT& varSrc); - OLEVariant(const OLEVariant& varSrc) ; - OLEVariant(sal_Bool x) ; - OLEVariant(sal_Int8 n) ; - OLEVariant(sal_Int16 n) ; - OLEVariant(sal_Int32 n) ; - OLEVariant(sal_Int64 x) ; - - OLEVariant(const rtl::OUString& us) ; - ~OLEVariant() ; + OLEVariant(const OLEVariant& varSrc) ; + OLEVariant(sal_Bool x) ; + OLEVariant(sal_Int8 n) ; + OLEVariant(sal_Int16 n) ; + OLEVariant(sal_Int32 n) ; + OLEVariant(sal_Int64 x) ; + + OLEVariant(const rtl::OUString& us) ; + ~OLEVariant() ; OLEVariant(const ::com::sun::star::util::Date& x ); OLEVariant(const ::com::sun::star::util::Time& x ); OLEVariant(const ::com::sun::star::util::DateTime& x ); @@ -107,21 +107,21 @@ namespace connectivity // Assign a const VARIANT* (::VariantCopy handles everything) // OLEVariant& operator=(const VARIANT* pSrc); - void setByte(sal_uInt8 n) ; - void setInt16(sal_Int16 n) ; - void setInt32(sal_Int32 n) ; - void setFloat(float f) ; - void setDouble(double d) ; - void setDate(DATE d) ; - void setChar(unsigned char a) ; - void setCurrency(double aCur) ; - void setBool(sal_Bool b) ; - void setString(const rtl::OUString& us) ; - void setNoArg() ; + void setByte(sal_uInt8 n) ; + void setInt16(sal_Int16 n) ; + void setInt32(sal_Int32 n) ; + void setFloat(float f) ; + void setDouble(double d) ; + void setDate(DATE d) ; + void setChar(unsigned char a) ; + void setCurrency(double aCur) ; + void setBool(sal_Bool b) ; + void setString(const rtl::OUString& us) ; + void setNoArg() ; void setIDispatch(IDispatch* pDispInterface); - void setNull() ; - void setEmpty() ; + void setNull() ; + void setEmpty() ; void setUI1SAFEARRAYPtr(SAFEARRAY* pSafeAr); void setArray(SAFEARRAY* pSafeArray, VARTYPE vtType); @@ -134,31 +134,31 @@ namespace connectivity operator ::rtl::OUString() const; - operator sal_Bool() const { return getBool(); } - operator sal_Int8() const { return getInt8(); } - operator sal_Int16() const { return getInt16(); } - operator sal_Int32() const { return getInt32(); } - operator float() const { return getFloat(); } - operator double() const { return getDouble(); } + operator sal_Bool() const { return getBool(); } + operator sal_Int8() const { return getInt8(); } + operator sal_Int16() const { return getInt16(); } + operator sal_Int32() const { return getInt32(); } + operator float() const { return getFloat(); } + operator double() const { return getDouble(); } operator ::com::sun::star::uno::Sequence< sal_Int8 >() const; operator ::com::sun::star::util::Date() const ; - operator ::com::sun::star::util::Time() const ; + operator ::com::sun::star::util::Time() const ; operator ::com::sun::star::util::DateTime()const ; - ::rtl::OUString getString() const; - sal_Bool getBool() const; - IUnknown* getIUnknown() const; - IDispatch* getIDispatch() const; - sal_uInt8 getByte() const; - sal_Int16 getInt16() const; - sal_Int8 getInt8() const; - sal_Int32 getInt32() const; - sal_uInt32 getUInt32() const; - float getFloat() const; - double getDouble() const; - double getDate() const; - CY getCurrency() const; - SAFEARRAY* getUI1SAFEARRAYPtr() const; + ::rtl::OUString getString() const; + sal_Bool getBool() const; + IUnknown* getIUnknown() const; + IDispatch* getIDispatch() const; + sal_uInt8 getByte() const; + sal_Int16 getInt16() const; + sal_Int8 getInt8() const; + sal_Int32 getInt32() const; + sal_uInt32 getUInt32() const; + float getFloat() const; + double getDouble() const; + double getDate() const; + CY getCurrency() const; + SAFEARRAY* getUI1SAFEARRAYPtr() const; ::com::sun::star::uno::Any makeAny() const; static VARIANT_BOOL VariantBool(sal_Bool bEinBoolean); diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index 79371befcb7f..fe582e1e39f1 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.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 @@ -156,7 +156,7 @@ namespace connectivity inline void Refresh(){pInterface->Refresh();} - inline sal_Int32 GetItemCount() const + inline sal_Int32 GetItemCount() const { sal_Int32 nCount = 0; return pInterface ? (SUCCEEDED(pInterface->get_Count(&nCount)) ? nCount : sal_Int32(0)) : sal_Int32(0); diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx index 10476e790ca5..8c69f6e91e06 100644 --- a/connectivity/source/inc/ado/Awrapado.hxx +++ b/connectivity/source/inc/ado/Awrapado.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,8 +54,8 @@ namespace connectivity class WpADOError; class WpADOProperty; - typedef WpOLEAppendCollection< ADOFields, ADOField, WpADOField> WpADOFields; - typedef WpOLECollection< ADOProperties, ADOProperty, WpADOProperty> WpADOProperties; + typedef WpOLEAppendCollection< ADOFields, ADOField, WpADOField> WpADOFields; + typedef WpOLECollection< ADOProperties, ADOProperty, WpADOProperty> WpADOProperties; //------------------------------------------------------------------------ class WpADOConnection : public WpOLEBase<ADOConnection> @@ -63,7 +63,7 @@ namespace connectivity friend class WpADOCommand; public: - WpADOConnection(ADOConnection* pInt) : WpOLEBase<ADOConnection>(pInt){} + WpADOConnection(ADOConnection* pInt) : WpOLEBase<ADOConnection>(pInt){} WpADOConnection(const WpADOConnection& rhs){operator=(rhs);} @@ -82,7 +82,7 @@ namespace connectivity void PutCommandTimeout(sal_Int32 nRet); - sal_Int32 GetConnectionTimeout() const ; + sal_Int32 GetConnectionTimeout() const ; void PutConnectionTimeout(sal_Int32 nRet); @@ -173,7 +173,7 @@ namespace connectivity WpADOCommand(){} // Konstruktoren, operator= // diese rufen nur die Oberklasse - WpADOCommand(ADOCommand* pInt) : WpOLEBase<ADOCommand>(pInt){} + WpADOCommand(ADOCommand* pInt) : WpOLEBase<ADOCommand>(pInt){} WpADOCommand(const WpADOCommand& rhs){operator=(rhs);} @@ -236,7 +236,7 @@ namespace connectivity //------------------------------------------------------------------------ class WpADOField : public WpOLEBase<ADOField> { - // friend class WpADOFields; + // friend class WpADOFields; public: // Konstruktoren, operator= @@ -251,7 +251,7 @@ namespace connectivity WpADOProperties get_Properties(); sal_Int32 GetActualSize() const ; sal_Int32 GetAttributes() const ; - sal_Int32 GetStatus() const ; + sal_Int32 GetStatus() const ; sal_Int32 GetDefinedSize() const ; // gibt den Namen des Feldes zur"ueck ::rtl::OUString GetName() const ; @@ -320,8 +320,8 @@ namespace connectivity } ~WpADORecordset() { - // if(pInterface && get_State() == adStateOpen) - // Close(); + // if(pInterface && get_State() == adStateOpen) + // Close(); } ////////////////////////////////////////////////////////////////////// void Create(); @@ -400,19 +400,19 @@ namespace connectivity { public: /** putValue set the property value at the ado column - @param _rProps the properties where to set - @param _aPosition which property to set - @param _aValVar the value to set + @param _rProps the properties where to set + @param _aPosition which property to set + @param _aValVar the value to set */ - static void putValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition,const OLEVariant &_aValVar); + static void putValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition,const OLEVariant &_aValVar); /** getValue returns a specific property value - @param _rProps the properties where to set - @param _aPosition the property + @param _rProps the properties where to set + @param _aPosition the property - @return the property value + @return the property value */ - static OLEVariant getValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition); + static OLEVariant getValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition); }; } } diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx index 614c139aecb5..aaab885eca6b 100644 --- a/connectivity/source/inc/ado/Awrapadox.hxx +++ b/connectivity/source/inc/ado/Awrapadox.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 @@ -34,7 +34,7 @@ #ifndef __User_FWD_DEFINED__ #define __User_FWD_DEFINED__ typedef struct _ADOUser User; -#endif /* __User_FWD_DEFINED__ */ +#endif /* __User_FWD_DEFINED__ */ #ifndef __Group_FWD_DEFINED__ #define __Group_FWD_DEFINED__ @@ -44,7 +44,7 @@ typedef struct _ADOGroup Group; #ifndef __Column_FWD_DEFINED__ #define __Column_FWD_DEFINED__ typedef struct _ADOColumn Column; -#endif /* __Column_FWD_DEFINED__ */ +#endif /* __Column_FWD_DEFINED__ */ #ifndef __Index_FWD_DEFINED__ #define __Index_FWD_DEFINED__ @@ -54,12 +54,12 @@ typedef struct _ADOIndex Index; #ifndef __Key_FWD_DEFINED__ #define __Key_FWD_DEFINED__ typedef struct _ADOKey Key; -#endif /* __Key_FWD_DEFINED__ */ +#endif /* __Key_FWD_DEFINED__ */ #ifndef __Table_FWD_DEFINED__ #define __Table_FWD_DEFINED__ typedef struct _ADOTable Table; -#endif /* __Table_FWD_DEFINED__ */ +#endif /* __Table_FWD_DEFINED__ */ #include "ado_pre_sys_include.h" @@ -85,7 +85,7 @@ namespace connectivity class WpADOView : public WpOLEBase<ADOView> { public: - WpADOView(ADOView* pInt=NULL) : WpOLEBase<ADOView>(pInt){} + WpADOView(ADOView* pInt=NULL) : WpOLEBase<ADOView>(pInt){} WpADOView(const WpADOView& rhs){operator=(rhs);} inline WpADOView& operator=(const WpADOView& rhs) @@ -99,7 +99,7 @@ namespace connectivity class WpADOGroup : public WpOLEBase<ADOGroup> { public: - WpADOGroup(ADOGroup* pInt=NULL) : WpOLEBase<ADOGroup>(pInt){} + WpADOGroup(ADOGroup* pInt=NULL) : WpOLEBase<ADOGroup>(pInt){} WpADOGroup(const WpADOGroup& rhs){operator=(rhs);} inline WpADOGroup& operator=(const WpADOGroup& rhs) @@ -123,7 +123,7 @@ namespace connectivity class WpADOUser : public WpOLEBase<_ADOUser> { public: - WpADOUser(_ADOUser* pInt=NULL) : WpOLEBase<_ADOUser>(pInt){} + WpADOUser(_ADOUser* pInt=NULL) : WpOLEBase<_ADOUser>(pInt){} WpADOUser(const WpADOUser& rhs){operator=(rhs);} inline WpADOUser& operator=(const WpADOUser& rhs) diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx index 8ebbb6259c35..1cc25e25bd41 100644 --- a/connectivity/source/inc/ado/WrapCatalog.hxx +++ b/connectivity/source/inc/ado/WrapCatalog.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 @@ -37,7 +37,7 @@ namespace connectivity class WpADOCatalog : public WpOLEBase<_ADOCatalog> { public: - WpADOCatalog(_ADOCatalog* pInt = NULL) : WpOLEBase<_ADOCatalog>(pInt){} + WpADOCatalog(_ADOCatalog* pInt = NULL) : WpOLEBase<_ADOCatalog>(pInt){} WpADOCatalog(const WpADOCatalog& rhs){operator=(rhs);} inline WpADOCatalog& operator=(const WpADOCatalog& rhs) @@ -46,11 +46,11 @@ namespace connectivity ::rtl::OUString GetObjectOwner(const ::rtl::OUString& _rName, ObjectTypeEnum _eNum); void putref_ActiveConnection(IDispatch* pCon); - WpADOTables get_Tables(); - WpADOViews get_Views(); - WpADOGroups get_Groups(); - WpADOUsers get_Users(); - ADOProcedures* get_Procedures(); + WpADOTables get_Tables(); + WpADOViews get_Views(); + WpADOGroups get_Groups(); + WpADOUsers get_Users(); + ADOProcedures* get_Procedures(); void Create(); }; } diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx index e39474b5057b..4245ef5b3168 100644 --- a/connectivity/source/inc/ado/WrapColumn.hxx +++ b/connectivity/source/inc/ado/WrapColumn.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 @@ -41,7 +41,7 @@ namespace connectivity class WpADOColumn : public WpOLEBase<_ADOColumn> { public: - WpADOColumn(_ADOColumn* pInt=NULL) : WpOLEBase<_ADOColumn>(pInt){} + WpADOColumn(_ADOColumn* pInt=NULL) : WpOLEBase<_ADOColumn>(pInt){} WpADOColumn(const WpADOColumn& rhs){operator=(rhs);} void Create(); diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx index bc350f72eb3d..1847adfeae65 100644 --- a/connectivity/source/inc/ado/WrapIndex.hxx +++ b/connectivity/source/inc/ado/WrapIndex.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 @@ -37,7 +37,7 @@ namespace connectivity class WpADOIndex : public WpOLEBase<_ADOIndex> { public: - WpADOIndex(_ADOIndex* pInt=NULL) : WpOLEBase<_ADOIndex>(pInt){} + WpADOIndex(_ADOIndex* pInt=NULL) : WpOLEBase<_ADOIndex>(pInt){} WpADOIndex(const WpADOIndex& rhs){operator=(rhs);} inline WpADOIndex& operator=(const WpADOIndex& rhs) @@ -46,14 +46,14 @@ namespace connectivity void Create(); ::rtl::OUString get_Name() const; - void put_Name(const ::rtl::OUString& _rName); - sal_Bool get_Clustered() const; - void put_Clustered(sal_Bool _b); - sal_Bool get_Unique() const; - void put_Unique(sal_Bool _b); - sal_Bool get_PrimaryKey() const; - void put_PrimaryKey(sal_Bool _b); - WpADOColumns get_Columns() const; + void put_Name(const ::rtl::OUString& _rName); + sal_Bool get_Clustered() const; + void put_Clustered(sal_Bool _b); + sal_Bool get_Unique() const; + void put_Unique(sal_Bool _b); + sal_Bool get_PrimaryKey() const; + void put_PrimaryKey(sal_Bool _b); + WpADOColumns get_Columns() const; }; } } diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx index 3666338fd613..50b70954e4e9 100644 --- a/connectivity/source/inc/ado/WrapKey.hxx +++ b/connectivity/source/inc/ado/WrapKey.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 @@ -37,7 +37,7 @@ namespace connectivity class WpADOKey : public WpOLEBase<ADOKey> { public: - WpADOKey(ADOKey* pInt=NULL) : WpOLEBase<ADOKey>(pInt){} + WpADOKey(ADOKey* pInt=NULL) : WpOLEBase<ADOKey>(pInt){} WpADOKey(const WpADOKey& rhs){operator=(rhs);} inline WpADOKey& operator=(const WpADOKey& rhs) diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx index 646b26e333de..7c94004230cc 100644 --- a/connectivity/source/inc/ado/WrapTable.hxx +++ b/connectivity/source/inc/ado/WrapTable.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 class WpADOTable : public WpOLEBase<_ADOTable> { public: - WpADOTable(_ADOTable* pInt=NULL) : WpOLEBase<_ADOTable>(pInt){} + WpADOTable(_ADOTable* pInt=NULL) : WpOLEBase<_ADOTable>(pInt){} WpADOTable(const WpADOTable& rhs){operator=(rhs);} inline WpADOTable& operator=(const WpADOTable& rhs) @@ -48,18 +48,18 @@ namespace connectivity void Create(); ::rtl::OUString get_Name() const; - void put_Name(const ::rtl::OUString& _rName); + void put_Name(const ::rtl::OUString& _rName); ::rtl::OUString get_Type() const; - WpADOColumns get_Columns() const; - WpADOIndexes get_Indexes() const; - WpADOKeys get_Keys() const; - WpADOCatalog get_ParentCatalog() const; + WpADOColumns get_Columns() const; + WpADOIndexes get_Indexes() const; + WpADOKeys get_Keys() const; + WpADOCatalog get_ParentCatalog() const; WpADOProperties get_Properties() const; - void putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject); + void putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject); }; - - typedef WpOLEAppendCollection<ADOTables, _ADOTable, WpADOTable> WpADOTables; + + typedef WpOLEAppendCollection<ADOTables, _ADOTable, WpADOTable> WpADOTables; } } diff --git a/connectivity/source/inc/ado/WrapTypeDefs.hxx b/connectivity/source/inc/ado/WrapTypeDefs.hxx index c81ec6839ae9..c96bcebc6982 100644 --- a/connectivity/source/inc/ado/WrapTypeDefs.hxx +++ b/connectivity/source/inc/ado/WrapTypeDefs.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 @@ -41,13 +41,13 @@ namespace connectivity class WpADOView; class WpADOUser; - typedef WpOLEAppendCollection<ADOTables, _ADOTable, WpADOTable> WpADOTables; - typedef WpOLEAppendCollection<ADOKeys, ADOKey, WpADOKey> WpADOKeys; - typedef WpOLEAppendCollection<ADOIndexes, _ADOIndex, WpADOIndex> WpADOIndexes; - typedef WpOLEAppendCollection<ADOColumns, _ADOColumn, WpADOColumn> WpADOColumns; - typedef WpOLEAppendCollection<ADOGroups, ADOGroup, WpADOGroup> WpADOGroups; - typedef WpOLEAppendCollection<ADOViews, ADOView, WpADOView> WpADOViews; - typedef WpOLEAppendCollection<ADOUsers, _ADOUser, WpADOUser> WpADOUsers; + typedef WpOLEAppendCollection<ADOTables, _ADOTable, WpADOTable> WpADOTables; + typedef WpOLEAppendCollection<ADOKeys, ADOKey, WpADOKey> WpADOKeys; + typedef WpOLEAppendCollection<ADOIndexes, _ADOIndex, WpADOIndex> WpADOIndexes; + typedef WpOLEAppendCollection<ADOColumns, _ADOColumn, WpADOColumn> WpADOColumns; + typedef WpOLEAppendCollection<ADOGroups, ADOGroup, WpADOGroup> WpADOGroups; + typedef WpOLEAppendCollection<ADOViews, ADOView, WpADOView> WpADOViews; + typedef WpOLEAppendCollection<ADOUsers, _ADOUser, WpADOUser> WpADOUsers; } } diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx index eb07d0200582..8744c614142d 100644 --- a/connectivity/source/inc/ado/adoimp.hxx +++ b/connectivity/source/inc/ado/adoimp.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,62 +49,62 @@ namespace connectivity // Auch hier: BSTR mit SysFreeString() freigeben! static OLEString& GetKeyStr(); - static const CLSID CLSID_ADOCATALOG_25; - static const IID IID_ADOCATALOG_25; + static const CLSID CLSID_ADOCATALOG_25; + static const IID IID_ADOCATALOG_25; - static const CLSID CLSID_ADOCONNECTION_21; - static const IID IID_ADOCONNECTION_21; + static const CLSID CLSID_ADOCONNECTION_21; + static const IID IID_ADOCONNECTION_21; - static const CLSID CLSID_ADOCOMMAND_21; - static const IID IID_ADOCOMMAND_21; + static const CLSID CLSID_ADOCOMMAND_21; + static const IID IID_ADOCOMMAND_21; - static const CLSID CLSID_ADORECORDSET_21; - static const IID IID_ADORECORDSET_21; + static const CLSID CLSID_ADORECORDSET_21; + static const IID IID_ADORECORDSET_21; - static const CLSID CLSID_ADOINDEX_25; - static const IID IID_ADOINDEX_25; + static const CLSID CLSID_ADOINDEX_25; + static const IID IID_ADOINDEX_25; - static const CLSID CLSID_ADOCOLUMN_25; - static const IID IID_ADOCOLUMN_25; + static const CLSID CLSID_ADOCOLUMN_25; + static const IID IID_ADOCOLUMN_25; - static const CLSID CLSID_ADOKEY_25; - static const IID IID_ADOKEY_25; + static const CLSID CLSID_ADOKEY_25; + static const IID IID_ADOKEY_25; - static const CLSID CLSID_ADOTABLE_25; - static const IID IID_ADOTABLE_25; + static const CLSID CLSID_ADOTABLE_25; + static const IID IID_ADOTABLE_25; - static const CLSID CLSID_ADOGROUP_25; - static const IID IID_ADOGROUP_25; + static const CLSID CLSID_ADOGROUP_25; + static const IID IID_ADOGROUP_25; - static const CLSID CLSID_ADOUSER_25; - static const IID IID_ADOUSER_25; + static const CLSID CLSID_ADOUSER_25; + static const IID IID_ADOUSER_25; - static const CLSID CLSID_ADOVIEW_25; - static const IID IID_ADOVIEW_25; + static const CLSID CLSID_ADOVIEW_25; + static const IID IID_ADOVIEW_25; static void ThrowException(ADOConnection* _pAdoCon,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); static sal_Int32 MapADOType2Jdbc(DataTypeEnum eType); static DataTypeEnum MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine); static sal_Bool isJetEngine(sal_Int32 _nEngineType); - static ObjectTypeEnum mapObjectType2Ado(sal_Int32 objType); - static sal_Int32 mapAdoType2Object(ObjectTypeEnum objType); - static sal_Int32 mapAdoRights2Sdbc(RightsEnum eRights); - static sal_Int32 mapRights2Ado(sal_Int32 nRights); + static ObjectTypeEnum mapObjectType2Ado(sal_Int32 objType); + static sal_Int32 mapAdoType2Object(ObjectTypeEnum objType); + static sal_Int32 mapAdoRights2Sdbc(RightsEnum eRights); + static sal_Int32 mapRights2Ado(sal_Int32 nRights); - static WpADOField getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + static WpADOField getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } } -#define ADO_PROP(ItemName) \ - WpADOProperty aProp(aProps.GetItem(ItemName)); \ - OLEVariant aVar; \ - if(aProp.IsValid()) \ - aVar = aProp.GetValue(); \ - else \ +#define ADO_PROP(ItemName) \ + WpADOProperty aProp(aProps.GetItem(ItemName)); \ + OLEVariant aVar; \ + if(aProp.IsValid()) \ + aVar = aProp.GetValue(); \ + else \ ADOS::ThrowException(*m_pADOConnection,*this); diff --git a/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx index fb3616c0a075..d5b21d3e6aee 100644 --- a/connectivity/source/inc/calc/CCatalog.hxx +++ b/connectivity/source/inc/calc/CCatalog.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/source/inc/calc/CColumns.hxx b/connectivity/source/inc/calc/CColumns.hxx index bef6a7b767e8..73e83f518c81 100644 --- a/connectivity/source/inc/calc/CColumns.hxx +++ b/connectivity/source/inc/calc/CColumns.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/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index b58f25cfc8c7..94391b98a559 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.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/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx index e001e315f502..93e706d9aa76 100644 --- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx +++ b/connectivity/source/inc/calc/CDatabaseMetaData.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 //************ Class: java.sql.DatabaseMetaDataDate //************************************************************** - class OCalcDatabaseMetaData : public file::ODatabaseMetaData + class OCalcDatabaseMetaData : public file::ODatabaseMetaData { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx index 1488d3605888..c88cf742b671 100644 --- a/connectivity/source/inc/calc/CDriver.hxx +++ b/connectivity/source/inc/calc/CDriver.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/source/inc/calc/CPreparedStatement.hxx b/connectivity/source/inc/calc/CPreparedStatement.hxx index 331b3aa5212d..7166b7ff5f6b 100644 --- a/connectivity/source/inc/calc/CPreparedStatement.hxx +++ b/connectivity/source/inc/calc/CPreparedStatement.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/source/inc/calc/CResultSet.hxx b/connectivity/source/inc/calc/CResultSet.hxx index d144f75dc09e..171069a014dc 100644 --- a/connectivity/source/inc/calc/CResultSet.hxx +++ b/connectivity/source/inc/calc/CResultSet.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 @@ -41,8 +41,8 @@ namespace connectivity // these typedef's are only necessary for the compiler typedef ::cppu::ImplHelper2< ::com::sun::star::sdbcx::XRowLocate, ::com::sun::star::sdbcx::XDeleteRows> OCalcResultSet_BASE; - typedef file::OResultSet OCalcResultSet_BASE2; - typedef ::comphelper::OPropertyArrayUsageHelper<OCalcResultSet> OCalcResultSet_BASE3; + typedef file::OResultSet OCalcResultSet_BASE2; + typedef ::comphelper::OPropertyArrayUsageHelper<OCalcResultSet> OCalcResultSet_BASE3; class OCalcResultSet : public OCalcResultSet_BASE2, @@ -59,7 +59,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - OCalcResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); + OCalcResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); private: // XInterface diff --git a/connectivity/source/inc/calc/CStatement.hxx b/connectivity/source/inc/calc/CStatement.hxx index 46df690cb65d..d919c457e9b0 100644 --- a/connectivity/source/inc/calc/CStatement.hxx +++ b/connectivity/source/inc/calc/CStatement.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/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 0db28e7fd9a5..8e907b6d37aa 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.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 @@ -31,7 +31,7 @@ #include "file/FTable.hxx" #include <tools/date.hxx> - + namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; class XSpreadsheetDocument; @@ -53,11 +53,11 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; - class OCalcTable : public OCalcTable_BASE + class OCalcTable : public OCalcTable_BASE { - private: - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth + private: + ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + ::std::vector<sal_Int32> m_aPrecisions; // same as aboth ::std::vector<sal_Int32> m_aScales; ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > m_xSheet; OCalcConnection* m_pConnection; diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx index 97f8f161fdbc..5ba872b98ccd 100644 --- a/connectivity/source/inc/calc/CTables.hxx +++ b/connectivity/source/inc/calc/CTables.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/source/inc/dbase/DCatalog.hxx b/connectivity/source/inc/dbase/DCatalog.hxx index 493fc94b470b..6814277ba0eb 100644 --- a/connectivity/source/inc/dbase/DCatalog.hxx +++ b/connectivity/source/inc/dbase/DCatalog.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/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx index 7c5fc7312e1a..c5a0d667903f 100644 --- a/connectivity/source/inc/dbase/DCode.hxx +++ b/connectivity/source/inc/dbase/DCode.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/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx index fc86b7d42378..159544100244 100644 --- a/connectivity/source/inc/dbase/DColumns.hxx +++ b/connectivity/source/inc/dbase/DColumns.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/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx index 6d93cc5a19ac..97c1ca32f00d 100644 --- a/connectivity/source/inc/dbase/DConnection.hxx +++ b/connectivity/source/inc/dbase/DConnection.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,7 +42,7 @@ namespace connectivity protected: virtual ~ODbaseConnection(); public: - ODbaseConnection(ODriver* _pDriver); + ODbaseConnection(ODriver* _pDriver); // XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx index cde83ca67497..1c661bceccb4 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaData.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 //************ Class: java.sql.DatabaseMetaDataDate //************************************************************** - class ODbaseDatabaseMetaData : public file::ODatabaseMetaData + class ODbaseDatabaseMetaData : public file::ODatabaseMetaData { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx index 2d24d0f7585e..12fc3ebced3f 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.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 @@ -64,29 +64,29 @@ namespace connectivity DECLARE_STL_VECTOR(::com::sun::star::uno::Any,ORow); DECLARE_STL_VECTOR(ORow, ORows); - class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, - public ODatabaseMetaDataResultSet_BASE, - public ::comphelper::OPropertyContainer, - public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> + class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, + public ODatabaseMetaDataResultSet_BASE, + public ::comphelper::OPropertyContainer, + public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { - ORows m_aRows; - ORowsIterator m_aRowsIter; - ::com::sun::star::uno::WeakReferenceHelper + ORows m_aRows; + ORowsIterator m_aRowsIter; + ::com::sun::star::uno::WeakReferenceHelper m_aStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - sal_Int32 m_nRowPos; - sal_Int32 m_nColPos; + sal_Int32 m_nRowPos; + sal_Int32 m_nColPos; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bWasNull; - sal_Bool m_bBOF; + sal_Bool m_bWasNull; + sal_Bool m_bBOF; void construct(); @@ -102,7 +102,7 @@ namespace connectivity DECLARE_CTY_DEFAULTS(ODatabaseMetaDataResultSet_BASE); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSet( ); - + void setRows(const ORows& _rRows) { m_aRows = _rRows; } diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx index 114aa25545fb..3a8adf9b9339 100644 --- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.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,15 +46,15 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; - class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE + class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { friend class ODatabaseMetaDataResultSet; ::std::vector<sal_Int32> m_vMapping; // when not every column is needed - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; + ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; - sal_Int32 m_nColCount; + sal_Int32 m_nColCount; protected: void setColumnPrivilegesMap(); @@ -71,7 +71,7 @@ namespace connectivity public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: ODatabaseMetaDataResultSetMetaData( ODatabaseMetaDataResultSet* _pRes) - : m_nColCount(0) + : m_nColCount(0) { } ~ODatabaseMetaDataResultSetMetaData(); diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx index eac29c1826c2..a4ac77d24a3a 100644 --- a/connectivity/source/inc/dbase/DDriver.hxx +++ b/connectivity/source/inc/dbase/DDriver.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 @@ -47,7 +47,7 @@ namespace connectivity // XInterface static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // XDriver diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index fb3ed77e7048..c241dce433aa 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.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 @@ -47,7 +47,7 @@ namespace connectivity typedef file::OBoolOperator OBoolOperator_BASE; typedef file::OOperand OOperand_BASE; - class ODbaseIndex : public ODbaseIndex_BASE + class ODbaseIndex : public ODbaseIndex_BASE { friend SvStream& operator << (SvStream &rStream, ODbaseIndex&); friend SvStream& operator >> (SvStream &rStream, ODbaseIndex&); @@ -63,34 +63,34 @@ namespace connectivity //================================================================== struct NDXHeader { - sal_uInt32 db_rootpage; /* Position der Rootpage */ - sal_uInt32 db_pagecount; /* Anzahl Pages */ - sal_uInt8 db_frei[4]; /* reserviert */ - sal_uInt16 db_keylen; /* Laenge des Schluessels */ - sal_uInt16 db_maxkeys; /* Max. # keys pro Seite */ + sal_uInt32 db_rootpage; /* Position der Rootpage */ + sal_uInt32 db_pagecount; /* Anzahl Pages */ + sal_uInt8 db_frei[4]; /* reserviert */ + sal_uInt16 db_keylen; /* Laenge des Schluessels */ + sal_uInt16 db_maxkeys; /* Max. # keys pro Seite */ sal_uInt16 db_keytype; /* Art des Schluessels (0-Text) - (1-Numerisch) */ + (1-Numerisch) */ sal_uInt16 db_keyrec; /* Laenge eines IndexSatzes - SatzNr + keylen */ - sal_uInt8 db_frei1[3]; /* reserviert */ - sal_uInt8 db_unique; /* eindeutig */ - char db_name[488]; /* index_name (Feldname) */ + SatzNr + keylen */ + sal_uInt8 db_frei1[3]; /* reserviert */ + sal_uInt8 db_unique; /* eindeutig */ + char db_name[488]; /* index_name (Feldname) */ }; private: - SvStream* m_pFileStream; // Stream zum Lesen/Schreiben des Index - NDXHeader m_aHeader; + SvStream* m_pFileStream; // Stream zum Lesen/Schreiben des Index + NDXHeader m_aHeader; ONDXPageList m_aCollector; // Pool von nicht mehr benoetigten Seiten - ONDXPagePtr m_aRoot, // Wurzel des b+ Baums - m_aCurLeaf; // aktuelles Blatt - USHORT m_nCurNode; // Position des aktuellen Knoten + ONDXPagePtr m_aRoot, // Wurzel des b+ Baums + m_aCurLeaf; // aktuelles Blatt + USHORT m_nCurNode; // Position des aktuellen Knoten - sal_uInt32 m_nPageCount, + sal_uInt32 m_nPageCount, m_nRootPage; - ODbaseTable* m_pTable; - BOOL m_bUseCollector : 1; // Verwenden des GarbageCollectors + ODbaseTable* m_pTable; + BOOL m_bUseCollector : 1; // Verwenden des GarbageCollectors ::rtl::OUString getCompletePath(); void closeImpl(); @@ -118,14 +118,14 @@ namespace connectivity virtual OIndexIterator* createIterator(OBoolOperator_BASE* pOp, const OOperand_BASE* pOperand = NULL); - void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;} - void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;} + void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;} + void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;} - sal_uInt32 GetRootPos() {return m_nRootPage;} - sal_uInt32 GetPageCount() {return m_nPageCount;} + sal_uInt32 GetRootPos() {return m_nRootPage;} + sal_uInt32 GetPageCount() {return m_nPageCount;} - BOOL IsText() const {return m_aHeader.db_keytype == 0;} - USHORT GetMaxNodes() const {return m_aHeader.db_maxkeys;} + BOOL IsText() const {return m_aHeader.db_keytype == 0;} + USHORT GetMaxNodes() const {return m_aHeader.db_maxkeys;} virtual BOOL Insert(sal_uInt32 nRec, const ORowSetValue& rValue); virtual BOOL Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&); diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx index 136c49a1f574..d967cd878d38 100644 --- a/connectivity/source/inc/dbase/DIndexColumns.hxx +++ b/connectivity/source/inc/dbase/DIndexColumns.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,7 +46,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); public: - ODbaseIndexColumns( ODbaseIndex* _pIndex, + ODbaseIndexColumns( ODbaseIndex* _pIndex, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector) diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx index a6c4308a35e2..cbc520a7e7f6 100644 --- a/connectivity/source/inc/dbase/DIndexIter.hxx +++ b/connectivity/source/inc/dbase/DIndexIter.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,12 +43,12 @@ namespace connectivity class OIndexIterator { protected: - file::OBoolOperator* m_pOperator; - const file::OOperand* m_pOperand; - ODbaseIndex* m_pIndex; - ONDXPagePtr m_aRoot, + file::OBoolOperator* m_pOperator; + const file::OOperand* m_pOperand; + ODbaseIndex* m_pIndex; + ONDXPagePtr m_aRoot, m_aCurLeaf; - USHORT m_nCurNode; + USHORT m_nCurNode; protected: ULONG Find(BOOL bFirst); diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx index bde6e63526da..a2eab66974fb 100644 --- a/connectivity/source/inc/dbase/DIndexes.hxx +++ b/connectivity/source/inc/dbase/DIndexes.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,7 +42,7 @@ namespace connectivity class ODbaseIndexes : public ODbaseIndexes_BASE { - ODbaseTable* m_pTable; + ODbaseTable* 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/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx index 52bbaf73bb8c..beaec2e58e66 100644 --- a/connectivity/source/inc/dbase/DPreparedStatement.hxx +++ b/connectivity/source/inc/dbase/DPreparedStatement.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/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx index d5a05e946dcf..9b2837916c96 100644 --- a/connectivity/source/inc/dbase/DResultSet.hxx +++ b/connectivity/source/inc/dbase/DResultSet.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 @@ -41,8 +41,8 @@ namespace connectivity // these typedef's are only necessary for the compiler typedef ::cppu::ImplHelper2< ::com::sun::star::sdbcx::XRowLocate, ::com::sun::star::sdbcx::XDeleteRows> ODbaseResultSet_BASE; - typedef file::OResultSet ODbaseResultSet_BASE2; - typedef ::comphelper::OPropertyArrayUsageHelper<ODbaseResultSet> ODbaseResultSet_BASE3; + typedef file::OResultSet ODbaseResultSet_BASE2; + typedef ::comphelper::OPropertyArrayUsageHelper<ODbaseResultSet> ODbaseResultSet_BASE3; class ODbaseResultSet : public ODbaseResultSet_BASE2, @@ -60,7 +60,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - ODbaseResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); + ODbaseResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx index 8029cf9ed79a..edb8c0310c56 100644 --- a/connectivity/source/inc/dbase/DStatement.hxx +++ b/connectivity/source/inc/dbase/DStatement.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/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index ba41c10c8df7..53d89af63a9d 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.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 @@ -45,14 +45,14 @@ namespace connectivity typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; - class ODbaseTable : public ODbaseTable_BASE + class ODbaseTable : public ODbaseTable_BASE { // der Typ einer dBase datei wird mit dem ersten Byte bestimmt public: - enum DBFType { dBaseIII = 0x03, + enum DBFType { dBaseIII = 0x03, dBaseIV = 0x04, - dBaseV = 0x05, - VisualFoxPro = 0x30, + dBaseV = 0x05, + VisualFoxPro = 0x30, VisualFoxProAuto = 0x31, // Visual FoxPro w. AutoIncrement field dBaseFS = 0x43, dBaseFSMemo = 0xB3, @@ -61,14 +61,14 @@ namespace connectivity dBaseIVMemoSQL = 0x8E, FoxProMemo = 0xF5 }; - enum DBFMemoType { MemodBaseIII = 0, + enum DBFMemoType { MemodBaseIII = 0, MemodBaseIV, MemoFoxPro }; private: struct DBFHeader { /* Kopfsatz-Struktur */ - DBFType db_typ; /* Dateityp */ + DBFType db_typ; /* Dateityp */ BYTE db_aedat[3]; /* Datum der letzen Aenderung */ /* JJ MM TT */ sal_uInt32 db_anz; /* Anzahl der Saetze */ @@ -86,20 +86,20 @@ namespace connectivity }; struct DBFMemoHeader { - DBFMemoType db_typ; /* Dateityp */ + DBFMemoType db_typ; /* Dateityp */ UINT32 db_next; /* naechster freier Block */ USHORT db_size; /* Blockgroesse: dBase 3 fest */ }; - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth + ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + ::std::vector<sal_Int32> m_aPrecisions; // same as aboth ::std::vector<sal_Int32> m_aScales; ::std::vector<sal_Int32> m_aRealFieldLengths; - DBFHeader m_aHeader; - DBFMemoHeader m_aMemoHeader; - SvStream* m_pMemoStream; + DBFHeader m_aHeader; + DBFMemoHeader m_aMemoHeader; + SvStream* m_pMemoStream; rtl_TextEncoding m_eEncoding; - sal_Bool m_bWriteableMemo; + sal_Bool m_bWriteableMemo; void alterColumn(sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor , @@ -126,7 +126,7 @@ namespace connectivity protected: virtual void FileClose(); -// using ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper; +// using ::connectivity::sdbcx::OTableDescriptor_BASE::rBHelper; public: virtual void refreshColumns(); @@ -162,8 +162,8 @@ namespace connectivity // XRename virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - BOOL DropImpl(); - BOOL CreateImpl(); + BOOL DropImpl(); + BOOL CreateImpl(); virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols); @@ -173,8 +173,8 @@ namespace connectivity virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor); virtual void dropColumn(sal_Int32 _nPos); - static String getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL ); - static BOOL Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes ); + static String getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL ); + static BOOL Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes ); virtual void refreshHeader(); diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx index 91ed713fe0b9..29f10222d980 100644 --- a/connectivity/source/inc/dbase/DTables.hxx +++ b/connectivity/source/inc/dbase/DTables.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/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 97808ff7d838..41c78aecc75e 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.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,8 +51,8 @@ namespace connectivity class ONDXKey : public ONDXKey_BASE { friend class ONDXNode; - UINT32 nRecord; /* Satzzeiger */ - ORowSetValue xValue; /* Schluesselwert */ + UINT32 nRecord; /* Satzzeiger */ + ORowSetValue xValue; /* Schluesselwert */ public: ONDXKey(UINT32 nRec=0); @@ -67,13 +67,13 @@ namespace connectivity virtual const ORowSetValue& getValue() const; - UINT32 GetRecord() const { return nRecord; } - void setRecord(UINT32 _nRec) { nRecord = _nRec; } - void ResetRecord() { nRecord = 0; } + UINT32 GetRecord() const { return nRecord; } + void setRecord(UINT32 _nRec) { nRecord = _nRec; } + void ResetRecord() { nRecord = 0; } BOOL operator == (const ONDXKey& rKey) const; BOOL operator != (const ONDXKey& rKey) const; - BOOL operator < (const ONDXKey& rKey) const; + BOOL operator < (const ONDXKey& rKey) const; BOOL operator <= (const ONDXKey& rKey) const; BOOL operator > (const ONDXKey& rKey) const; BOOL operator >= (const ONDXKey& rKey) const; @@ -101,7 +101,7 @@ namespace connectivity friend SvStream& operator << (SvStream &rStream, const ONDXPagePtr&); friend SvStream& operator >> (SvStream &rStream, ONDXPagePtr&); - UINT32 nPagePos; // Position in der Indexdatei + UINT32 nPagePos; // Position in der Indexdatei public: ONDXPagePtr(UINT32 nPos = 0):nPagePos(nPos){} @@ -113,7 +113,7 @@ namespace connectivity UINT32 GetPagePos() const {return nPagePos;} BOOL HasPage() const {return nPagePos != 0;} - // sal_Bool Is() const { return isValid(); } + // sal_Bool Is() const { return isValid(); } }; //================================================================== // Index Seite @@ -125,26 +125,26 @@ namespace connectivity friend SvStream& operator << (SvStream &rStream, const ONDXPage&); friend SvStream& operator >> (SvStream &rStream, ONDXPage&); - UINT32 nPagePos; // Position in der Indexdatei - BOOL bModified : 1; - USHORT nCount; + UINT32 nPagePos; // Position in der Indexdatei + BOOL bModified : 1; + USHORT nCount; - ONDXPagePtr aParent, // VaterSeite - aChild; // Zeiger auf rechte ChildPage + ONDXPagePtr aParent, // VaterSeite + aChild; // Zeiger auf rechte ChildPage ODbaseIndex& rIndex; - ONDXNode* ppNodes; // array von Knoten + ONDXNode* ppNodes; // array von Knoten public: // Knoten Operationen - USHORT Count() const {return nCount;} + USHORT Count() const {return nCount;} - BOOL Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0); - BOOL Insert(USHORT nIndex, ONDXNode& rNode); - BOOL Append(ONDXNode& rNode); - BOOL Delete(USHORT); - void Remove(USHORT); - void Release(BOOL bSave = TRUE); - void ReleaseFull(BOOL bSave = TRUE); + BOOL Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0); + BOOL Insert(USHORT nIndex, ONDXNode& rNode); + BOOL Append(ONDXNode& rNode); + BOOL Delete(USHORT); + void Remove(USHORT); + void Release(BOOL bSave = TRUE); + void ReleaseFull(BOOL bSave = TRUE); // Aufteilen und Zerlegen ONDXNode Split(ONDXPage& rPage); @@ -187,7 +187,7 @@ namespace connectivity void SetModified(BOOL bMod) {bModified = bMod;} void SetPagePos(UINT32 nPage) {nPagePos = nPage;} - BOOL Find(const ONDXKey&); // rek. Abstieg + BOOL Find(const ONDXKey&); // rek. Abstieg USHORT FindPos(const ONDXKey& rKey) const; #if OSL_DEBUG_LEVEL > 1 @@ -222,7 +222,7 @@ namespace connectivity SvStream& operator << (SvStream &rStream, const ONDXPage& rPage); - typedef ::std::vector<ONDXPage*> ONDXPageList; + typedef ::std::vector<ONDXPage*> ONDXPageList; //================================================================== // Index Knoten @@ -230,8 +230,8 @@ namespace connectivity class ONDXNode { friend class ONDXPage; - ONDXPagePtr aChild; /* naechster Seitenverweis */ - ONDXKey aKey; + ONDXPagePtr aChild; /* naechster Seitenverweis */ + ONDXKey aKey; public: ONDXNode(){} @@ -240,16 +240,16 @@ namespace connectivity :aChild(aPagePtr),aKey(rKey) {} // verweist der Knoten auf eine Seite - BOOL HasChild() const {return aChild.HasPage();} + BOOL HasChild() const {return aChild.HasPage();} // Ist ein Index angegeben, kann gegebenfalls die Seite nachgeladen werden - ONDXPagePtr& GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL); + ONDXPagePtr& GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL); - const ONDXKey& GetKey() const { return aKey;} - ONDXKey& GetKey() { return aKey;} + const ONDXKey& GetKey() const { return aKey;} + ONDXKey& GetKey() { return aKey;} // Setzen des Childs, ueber Referenz, um die PagePos zu erhalten - void SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = NULL); - void SetKey(ONDXKey& rKey) {aKey = rKey;} + void SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = NULL); + void SetKey(ONDXKey& rKey) {aKey = rKey;} void Write(SvStream &rStream, const ONDXPage& rPage) const; void Read(SvStream &rStream, ODbaseIndex&); @@ -257,32 +257,32 @@ namespace connectivity //================================================================== // inline implementation //================================================================== -// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec) -// : ONDXKey_BASE(eType) -// , nRecord(nRec),xValue(rVal) -// { -// } - - -// inline ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec) -// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) -// ,nRecord(nRec) -// { -// if (aStr.len()) -// xValue = aStr; -// } - -// inline ONDXKey::ONDXKey(double aVal, UINT32 nRec) -// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE) -// ,nRecord(nRec) -// ,xValue(aVal) -// { -// } - -// inline ONDXKey::ONDXKey(UINT32 nRec) -// :nRecord(nRec) -// { -// } +// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec) +// : ONDXKey_BASE(eType) +// , nRecord(nRec),xValue(rVal) +// { +// } + + +// inline ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec) +// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) +// ,nRecord(nRec) +// { +// if (aStr.len()) +// xValue = aStr; +// } + +// inline ONDXKey::ONDXKey(double aVal, UINT32 nRec) +// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE) +// ,nRecord(nRec) +// ,xValue(aVal) +// { +// } + +// inline ONDXKey::ONDXKey(UINT32 nRec) +// :nRecord(nRec) +// { +// } inline ONDXKey::ONDXKey(const ONDXKey& rKey) : ONDXKey_BASE(rKey.getDBType()) diff --git a/connectivity/source/inc/diagnose_ex.h b/connectivity/source/inc/diagnose_ex.h index 52043001c0bb..5ce8b47b7816 100644 --- a/connectivity/source/inc/diagnose_ex.h +++ b/connectivity/source/inc/diagnose_ex.h @@ -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/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx index 49afc2d7ef02..2886762debe0 100644 --- a/connectivity/source/inc/file/FCatalog.hxx +++ b/connectivity/source/inc/file/FCatalog.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,14 +42,14 @@ namespace connectivity public connectivity::sdbcx::OCatalog { protected: - OConnection* m_pConnection; + OConnection* m_pConnection; /** 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); public: virtual void refreshTables(); @@ -59,7 +59,7 @@ namespace connectivity public: OFileCatalog(OConnection* _pCon); - OConnection* getConnection() { return m_pConnection; } + OConnection* getConnection() { return m_pConnection; } virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx index 1d73de5924e3..409b184b0883 100644 --- a/connectivity/source/inc/file/FColumns.hxx +++ b/connectivity/source/inc/file/FColumns.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,12 +42,12 @@ namespace connectivity class OOO_DLLPUBLIC_FILE OColumns : public sdbcx::OCollection { protected: - OFileTable* m_pTable; + OFileTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - OColumns( OFileTable* _pTable, + OColumns( OFileTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector) diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 244d8055b4a8..612c8a471ed3 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.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 @@ -64,22 +64,22 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by - String m_aFilenameExtension; - OFileDriver* m_pDriver; // Pointer to the owning + String m_aFilenameExtension; + OFileDriver* m_pDriver; // Pointer to the owning // driver object - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > m_xDir; // directory - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; - - sal_Bool m_bClosed; - sal_Bool m_bAutoCommit; - sal_Bool m_bReadOnly; - sal_Bool m_bShowDeleted; - sal_Bool m_bCaseSensitiveExtension; - sal_Bool m_bCheckSQL92; + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > m_xDir; // directory + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent; + + sal_Bool m_bClosed; + sal_Bool m_bAutoCommit; + sal_Bool m_bReadOnly; + sal_Bool m_bShowDeleted; + sal_Bool m_bCaseSensitiveExtension; + sal_Bool m_bCheckSQL92; bool m_bDefaultTextEncoding; @@ -88,8 +88,8 @@ namespace connectivity virtual ~OConnection(); public: - OConnection(OFileDriver* _pDriver); - + OConnection(OFileDriver* _pDriver); + virtual void construct(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); @@ -126,23 +126,23 @@ namespace connectivity // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - //XUnoTunnel + //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(); // no interface methods ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > getDir() const; - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getContent() const { return m_xContent; } + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> getContent() const { return m_xContent; } // create a catalog or return the catalog already created virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); - sal_Bool matchesExtension( const String& _rExt ) const; + sal_Bool matchesExtension( const String& _rExt ) const; - inline const String& getExtension() const { return m_aFilenameExtension; } - inline sal_Bool isCaseSensitveExtension() const { return m_bCaseSensitiveExtension; } - inline OFileDriver* getDriver() const { return m_pDriver; } - inline sal_Bool showDeleted() const { return m_bShowDeleted; } - inline sal_Bool isCheckEnabled() const { return m_bCheckSQL92; } + inline const String& getExtension() const { return m_aFilenameExtension; } + inline sal_Bool isCaseSensitveExtension() const { return m_bCaseSensitiveExtension; } + inline OFileDriver* getDriver() const { return m_pDriver; } + inline sal_Bool showDeleted() const { return m_bShowDeleted; } + inline sal_Bool isCheckEnabled() const { return m_bCheckSQL92; } inline bool isTextEncodingDefaulted() const { return m_bDefaultTextEncoding; } public: @@ -153,7 +153,7 @@ namespace connectivity GrantAccess() { } }; - void setCaseSensitiveExtension( sal_Bool _bIsCS, GrantAccess ) { m_bCaseSensitiveExtension = _bIsCS; } + void setCaseSensitiveExtension( sal_Bool _bIsCS, GrantAccess ) { m_bCaseSensitiveExtension = _bIsCS; } }; } } diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx index bf4db7268912..aea33e07098b 100644 --- a/connectivity/source/inc/file/FDatabaseMetaData.hxx +++ b/connectivity/source/inc/file/FDatabaseMetaData.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,7 +42,7 @@ namespace connectivity //************************************************************** class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE ODatabaseMetaData : - public ODatabaseMetaDataBase + public ODatabaseMetaDataBase { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information @@ -189,7 +189,7 @@ namespace connectivity virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; } diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx index 4133e61e1b3d..0551d3fd4d16 100644 --- a/connectivity/source/inc/file/FDateFunctions.hxx +++ b/connectivity/source/inc/file/FDateFunctions.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 @@ -128,11 +128,11 @@ namespace connectivity /** WEEK(date) WEEK(date,first) With a single argument, returns the week for date, in the range 0 to 53 (yes, there may be the beginnings of a week 53), for locations where Sunday is the first day of the week. The two-argument form of WEEK() allows you to specify whether the week starts on Sunday or Monday and whether the return value should be in the range 0-53 or 1-52. Here is a table for how the second argument works: - Value Meaning - 0 Week starts on Sunday and return value is in range 0-53 - 1 Week starts on Monday and return value is in range 0-53 - 2 Week starts on Sunday and return value is in range 1-53 - 3 Week starts on Monday and return value is in range 1-53 (ISO 8601) + Value Meaning + 0 Week starts on Sunday and return value is in range 0-53 + 1 Week starts on Monday and return value is in range 0-53 + 2 Week starts on Sunday and return value is in range 1-53 + 3 Week starts on Monday and return value is in range 1-53 (ISO 8601) > SELECT WEEK('1998-02-20'); -> 7 diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx index 337f8488bbd0..4cf15e8d864a 100644 --- a/connectivity/source/inc/file/FDriver.hxx +++ b/connectivity/source/inc/file/FDriver.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 @@ -40,16 +40,16 @@ namespace connectivity { namespace file { - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver, + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::sdbcx::XDataDefinitionSupplier> ODriver_BASE; class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OFileDriver : public ODriver_BASE { protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; - connectivity::OWeakRefArray m_xConnections; // vector containing a list + connectivity::OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx index f98cdb7a2642..a76e988a5f82 100644 --- a/connectivity/source/inc/file/FNumericFunctions.hxx +++ b/connectivity/source/inc/file/FNumericFunctions.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/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index f6e7eee77ed9..069261a58506 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.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 @@ -34,7 +34,7 @@ #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> +// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/io/XInputStream.hpp> #include "file/FResultSet.hxx" @@ -44,7 +44,7 @@ namespace connectivity namespace file { - class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OPreparedStatement : public OStatement_BASE2, + class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OPreparedStatement : public OStatement_BASE2, public ::com::sun::star::sdbc::XPreparedStatement, public ::com::sun::star::sdbc::XParameters, public ::com::sun::star::sdbc::XResultSetMetaDataSupplier, @@ -55,12 +55,12 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - ::rtl::OUString m_aSql; - OValueRefRow m_aParameterRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - - OResultSet* m_pResultSet; - ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns + ::rtl::OUString m_aSql; + OValueRefRow m_aParameterRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; + + OResultSet* m_pResultSet; + ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; // the parameter columns // factory method for resultset's virtual OResultSet* createResultSet(); @@ -69,7 +69,7 @@ namespace connectivity void checkAndResizeParameters(sal_Int32 parameterIndex); void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x); - UINT32 AddParameter(connectivity::OSQLParseNode * pParameter, + UINT32 AddParameter(connectivity::OSQLParseNode * pParameter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol); void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); @@ -83,7 +83,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: OPreparedStatement( OConnection* _pConnection); - + virtual void construct(const ::rtl::OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 2701985ca4d3..3e82fa6e5f58 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.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 @@ -57,7 +57,7 @@ namespace connectivity namespace file { /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -73,79 +73,79 @@ namespace connectivity ::com::sun::star::lang::XUnoTunnel> OResultSet_BASE; class OOO_DLLPUBLIC_FILE OResultSet : - public comphelper::OBaseMutex, - public ::connectivity::IResultSetHelper, - public OResultSet_BASE, - public ::comphelper::OPropertyContainer, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + public comphelper::OBaseMutex, + public ::connectivity::IResultSetHelper, + public OResultSet_BASE, + public ::comphelper::OPropertyContainer, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { protected: - ::std::vector<void*> m_aBindVector; - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::std::vector<void*> m_aBindVector; + ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; + ::std::vector<sal_Int32> m_aOrderbyColumnNumber; ::std::vector<TAscendingOrder> m_aOrderbyAscending; - OValueRefRow m_aSelectRow; - OValueRefRow m_aRow; - OValueRefRow m_aEvaluateRow; // contains all values of a row - OValueRefRow m_aParameterRow; - OValueRefRow m_aInsertRow; // needed for insert by cursor - ORefAssignValues m_aAssignValues; // needed for insert,update and parameters + OValueRefRow m_aSelectRow; + OValueRefRow m_aRow; + OValueRefRow m_aEvaluateRow; // contains all values of a row + OValueRefRow m_aParameterRow; + OValueRefRow m_aInsertRow; // needed for insert by cursor + ORefAssignValues m_aAssignValues; // needed for insert,update and parameters // to compare with the restrictions - TIntVector* m_pEvaluationKeySet; - TIntVector::iterator m_aEvaluateIter; + TIntVector* m_pEvaluationKeySet; + TIntVector::iterator m_aEvaluateIter; -// TInt2IntMap m_aBookmarks; // map from bookmarks to logical position -// ::std::vector<TInt2IntMap::iterator> m_aBookmarksPositions;// vector of iterators to bookmark map, the order is the logical position - OSkipDeletedSet m_aSkipDeletedSet; +// TInt2IntMap m_aBookmarks; // map from bookmarks to logical position +// ::std::vector<TInt2IntMap::iterator> m_aBookmarksPositions;// vector of iterators to bookmark map, the order is the logical position + OSkipDeletedSet m_aSkipDeletedSet; - ::rtl::Reference<OKeySet> m_pFileSet; - OKeySet::Vector::iterator m_aFileSetIter; + ::rtl::Reference<OKeySet> m_pFileSet; + OKeySet::Vector::iterator m_aFileSetIter; - OSortIndex* m_pSortIndex; - ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns - ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; - OFileTable* m_pTable; - connectivity::OSQLParseNode* m_pParseTree; + OSortIndex* m_pSortIndex; + ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns + ::rtl::Reference<connectivity::OSQLColumns> m_xParamColumns; + OFileTable* m_pTable; + connectivity::OSQLParseNode* m_pParseTree; - OSQLAnalyzer* m_pSQLAnalyzer; - connectivity::OSQLParseTreeIterator& m_aSQLIterator; + OSQLAnalyzer* m_pSQLAnalyzer; + connectivity::OSQLParseTreeIterator& m_aSQLIterator; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xDBMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xColsIdx; // table columns + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xDBMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns + ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xColsIdx; // table columns - ::rtl::OUString m_aTableRange; - rtl_TextEncoding m_nTextEncoding; - sal_Int32 m_nRowPos; - sal_Int32 m_nFilePos; - sal_Int32 m_nLastVisitedPos; - sal_Int32 m_nRowCountResult; - sal_Int32 m_nCurrentPosition; // current position of the resultset is returned when ask for getRow() - sal_Int32 m_nColumnCount; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; // after last record - sal_Bool m_bLastRecord; - sal_Bool m_bInserted; // true when moveToInsertRow was called + ::rtl::OUString m_aTableRange; + rtl_TextEncoding m_nTextEncoding; + sal_Int32 m_nRowPos; + sal_Int32 m_nFilePos; + sal_Int32 m_nLastVisitedPos; + sal_Int32 m_nRowCountResult; + sal_Int32 m_nCurrentPosition; // current position of the resultset is returned when ask for getRow() + sal_Int32 m_nColumnCount; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; // after last record + sal_Bool m_bLastRecord; + sal_Bool m_bInserted; // true when moveToInsertRow was called // set to false when cursor moved or cancel - sal_Bool m_bRowUpdated; - sal_Bool m_bRowInserted; - sal_Bool m_bRowDeleted; - sal_Bool m_bShowDeleted; - sal_Bool m_bIsCount; + sal_Bool m_bRowUpdated; + sal_Bool m_bRowInserted; + sal_Bool m_bRowDeleted; + sal_Bool m_bShowDeleted; + sal_Bool m_bIsCount; void initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount); void construct(); @@ -184,7 +184,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - OResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); + OResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() { @@ -284,27 +284,27 @@ namespace connectivity virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); // special methods - inline sal_Int32 mapColumn(sal_Int32 column); + inline sal_Int32 mapColumn(sal_Int32 column); virtual BOOL OpenImpl(); virtual void doTableSpecials(const OSQLTable& _xTable); inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; } - inline void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; } - inline void setEvaluationRow(const OValueRefRow& _aRow) { m_aEvaluateRow = _aRow; } - inline void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns) { m_xParamColumns = _xParamColumns; } - inline void setAssignValues(const ORefAssignValues& _aAssignValues) { m_aAssignValues = _aAssignValues; } - inline void setBindingRow(const OValueRefRow& _aRow) { m_aRow = _aRow; } - inline void setSelectRow(const OValueRefRow& _rRow) - { - m_aSelectRow = _rRow; + inline void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; } + inline void setEvaluationRow(const OValueRefRow& _aRow) { m_aEvaluateRow = _aRow; } + inline void setParameterColumns(const ::rtl::Reference<connectivity::OSQLColumns>& _xParamColumns) { m_xParamColumns = _xParamColumns; } + inline void setAssignValues(const ORefAssignValues& _aAssignValues) { m_aAssignValues = _aAssignValues; } + inline void setBindingRow(const OValueRefRow& _aRow) { m_aRow = _aRow; } + inline void setSelectRow(const OValueRefRow& _rRow) + { + m_aSelectRow = _rRow; m_nColumnCount = m_aSelectRow->get().size(); } - inline void setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } - inline void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } + inline void setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } + inline void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } - inline void setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } + inline void setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } inline void setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrderbyAsc) { m_aOrderbyAscending = _aOrderbyAsc; } - inline void setEvaluationKeySet(TIntVector* _pEvaluationKeySet) { m_pEvaluationKeySet = _pEvaluationKeySet; } + inline void setEvaluationKeySet(TIntVector* _pEvaluationKeySet) { m_pEvaluationKeySet = _pEvaluationKeySet; } inline void setMetaData(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} // clears the resultset so it can be reused by a preparedstatement @@ -326,7 +326,7 @@ namespace connectivity // ------------------------------------------------------------------------- inline sal_Int32 OResultSet::mapColumn(sal_Int32 column) { - sal_Int32 map = column; + sal_Int32 map = column; OSL_ENSURE(column > 0, "file::OResultSet::mapColumn: invalid column index!"); // the first column (index 0) is for convenience only. The first real select column is no 1. diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx index e4824f5044e3..35dfde40124c 100644 --- a/connectivity/source/inc/file/FResultSetMetaData.hxx +++ b/connectivity/source/inc/file/FResultSetMetaData.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,18 +46,18 @@ namespace connectivity typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OOO_DLLPUBLIC_FILE OResultSetMetaData : - public OResultSetMetaData_BASE + public OResultSetMetaData_BASE { - ::rtl::OUString m_aTableName; - ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; - OFileTable* m_pTable; + ::rtl::OUString m_aTableName; + ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; + OFileTable* m_pTable; void checkColumnIndex(sal_Int32 column) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: virtual ~OResultSetMetaData(); public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable); + OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable); /// Avoid ambigous cast error from the compiler. inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index b1b5b3bdf465..bee5efef1953 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.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 @@ -68,49 +68,49 @@ namespace connectivity //************ Class: java.sql.Statement //************************************************************** class OOO_DLLPUBLIC_FILE OStatement_Base : - public comphelper::OBaseMutex, - public OStatement_BASE, - public ::comphelper::OPropertyContainer, - public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> + public comphelper::OBaseMutex, + public OStatement_BASE, + public ::comphelper::OPropertyContainer, + public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> { protected: - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime - ::std::vector<sal_Int32> m_aParameterIndexes; // maps the parameter index to column index - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; + ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::std::vector<sal_Int32> m_aParameterIndexes; // maps the parameter index to column index + ::std::vector<sal_Int32> m_aOrderbyColumnNumber; ::std::vector<TAscendingOrder> m_aOrderbyAscending; ::com::sun::star::sdbc::SQLWarning m_aLastWarning; ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xDBMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns // for this Statement + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColNames; // table columns // for this Statement - connectivity::OSQLParser m_aParser; - connectivity::OSQLParseTreeIterator m_aSQLIterator; + connectivity::OSQLParser m_aParser; + connectivity::OSQLParseTreeIterator m_aSQLIterator; - OConnection* m_pConnection;// The owning Connection object - connectivity::OSQLParseNode* m_pParseTree; - OSQLAnalyzer* m_pSQLAnalyzer; //the sql analyzer used by the resultset + OConnection* m_pConnection;// The owning Connection object + connectivity::OSQLParseNode* m_pParseTree; + OSQLAnalyzer* m_pSQLAnalyzer; //the sql analyzer used by the resultset - ::std::vector<sal_Int32>* m_pEvaluationKeySet; + ::std::vector<sal_Int32>* m_pEvaluationKeySet; - OFileTable* m_pTable; // the current table - OValueRefRow m_aSelectRow; - OValueRefRow m_aRow; - OValueRefRow m_aEvaluateRow; // contains all values of a row - ORefAssignValues m_aAssignValues; // needed for insert,update and parameters + OFileTable* m_pTable; // the current table + OValueRefRow m_aSelectRow; + OValueRefRow m_aRow; + OValueRefRow m_aEvaluateRow; // contains all values of a row + ORefAssignValues m_aAssignValues; // needed for insert,update and parameters // to compare with the restrictions - ::rtl::OUString m_aCursorName; - sal_Int32 m_nMaxFieldSize; - sal_Int32 m_nMaxRows; - sal_Int32 m_nQueryTimeOut; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bEscapeProcessing; + ::rtl::OUString m_aCursorName; + sal_Int32 m_nMaxFieldSize; + sal_Int32 m_nMaxRows; + sal_Int32 m_nQueryTimeOut; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; + sal_Bool m_bEscapeProcessing; ::cppu::OBroadcastHelper& rBHelper; @@ -137,7 +137,7 @@ namespace connectivity const String& aValue, BOOL bSetNull = FALSE, UINT32 nParameter=SQL_NO_PARAMETER); - void ParseAssignValues( const ::std::vector< String>& aColumnNameList, + void ParseAssignValues( const ::std::vector< String>& aColumnNameList, connectivity::OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex); virtual void parseParamterElem(const String& _sColumnName,OSQLParseNode* pRow_Value_Constructor_Elem); diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx index 6b3a6bc88c3e..8821d29aee22 100644 --- a/connectivity/source/inc/file/FStringFunctions.hxx +++ b/connectivity/source/inc/file/FStringFunctions.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/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index 687f96bb60bf..d9a9d395ccce 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.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,16 +44,16 @@ namespace connectivity { typedef connectivity::sdbcx::OTable OTable_TYPEDEF; - class OOO_DLLPUBLIC_FILE OFileTable : public OTable_TYPEDEF + class OOO_DLLPUBLIC_FILE OFileTable : public OTable_TYPEDEF { protected: - OConnection* m_pConnection; - SvStream* m_pFileStream; - ::rtl::Reference<OSQLColumns> m_aColumns; - sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement - sal_uInt8* m_pBuffer; - sal_uInt16 m_nBufferSize; // Groesse des ReadBuffer, wenn pBuffer != NULL - sal_Bool m_bWriteable; // svstream cann't say if we are writeable + OConnection* m_pConnection; + SvStream* m_pFileStream; + ::rtl::Reference<OSQLColumns> m_aColumns; + sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement + sal_uInt8* m_pBuffer; + sal_uInt16 m_nBufferSize; // Groesse des ReadBuffer, wenn pBuffer != NULL + sal_Bool m_bWriteable; // svstream cann't say if we are writeable // so we have to virtual void FileClose(); @@ -64,7 +64,7 @@ namespace connectivity virtual void refreshIndexes(); public: OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection); - OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, + OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString& _Description = ::rtl::OUString(), @@ -91,7 +91,7 @@ namespace connectivity virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols); virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor); virtual void dropColumn(sal_Int32 _nPos); - // refresh the header of file based tables to see changes done by someone + // refresh the header of file based tables to see changes done by someone virtual void refreshHeader(); ::rtl::OUString SAL_CALL getName() throw() { return m_Name; } @@ -103,7 +103,7 @@ namespace connectivity 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(); - + sal_Int32 getFilePos() const { return m_nFilePos; } public: diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx index e85fd51102bd..f2aa5c9f4851 100644 --- a/connectivity/source/inc/file/FTables.hxx +++ b/connectivity/source/inc/file/FTables.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 @@ -41,7 +41,7 @@ namespace connectivity public sdbcx::OCollection { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index 60eb3bfae559..c6f45df02353 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.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,16 +39,16 @@ namespace connectivity class OConnection; class OOO_DLLPUBLIC_FILE OSQLAnalyzer { - typedef ::std::list<OEvaluateSet*> OEvaluateSetList; + typedef ::std::list<OEvaluateSet*> OEvaluateSetList; typedef ::std::pair< ::rtl::Reference<OPredicateCompiler>,::rtl::Reference<OPredicateInterpreter> > TPredicates; - ::std::vector< TPredicates > m_aSelectionEvaluations; - ::rtl::Reference<OPredicateCompiler> m_aCompiler; - ::rtl::Reference<OPredicateInterpreter> m_aInterpreter; + ::std::vector< TPredicates > m_aSelectionEvaluations; + ::rtl::Reference<OPredicateCompiler> m_aCompiler; + ::rtl::Reference<OPredicateInterpreter> m_aInterpreter; OConnection* m_pConnection; - mutable sal_Bool m_bHasSelectionCode; - mutable sal_Bool m_bSelectionFirstTime; + mutable sal_Bool m_bHasSelectionCode; + mutable sal_Bool m_bSelectionFirstTime; void bindRow(OCodeList& rCodeList,const OValueRefRow& _pRow,OEvaluateSetList& _rEvaluateSetList); @@ -59,21 +59,21 @@ namespace connectivity { return ::rtl_allocateMemory( nSize ); } inline static void * SAL_CALL operator new( size_t /*nSize*/,void* _pHint ) SAL_THROW( () ) { return _pHint; } - inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) { ::rtl_freeMemory( pMem ); } inline static void SAL_CALL operator delete( void * /*pMem*/,void* /*_pHint*/ ) SAL_THROW( () ) { } OConnection* getConnection() const { return m_pConnection; } void describeParam(::rtl::Reference<OSQLColumns> rParameterColumns); // genauere Beschreibung der Parameter - ::std::vector<sal_Int32>* bindEvaluationRow(OValueRefRow& _pRow); // Anbinden einer Ergebniszeile an die Restrictions + ::std::vector<sal_Int32>* bindEvaluationRow(OValueRefRow& _pRow); // Anbinden einer Ergebniszeile an die Restrictions /** bind the select columns if they contain a function which needs a row value - @param _pRow the result row + @param _pRow the result row */ void bindSelectRow(const OValueRefRow& _pRow); /** binds the row to parameter for the restrictions - @param _pRow the parameter row + @param _pRow the parameter row */ void bindParameterRow(OValueRefRow& _pRow); @@ -84,7 +84,7 @@ namespace connectivity void clean(); virtual BOOL hasRestriction() const; virtual BOOL hasFunctions() const; - inline BOOL evaluateRestriction() { return m_aInterpreter->start(); } + inline BOOL evaluateRestriction() { return m_aInterpreter->start(); } void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping); void setOrigColumns(const OFileColumns& rCols); virtual OOperandAttr* createOperandAttr(sal_Int32 _nPos, diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index ce489a34832d..f52c95690ef5 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.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 @@ -90,16 +90,16 @@ namespace connectivity virtual sal_Int32 getDBType() const {return m_eDBType;} virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0); - inline sal_Bool isValid() const; + inline sal_Bool isValid() const; TYPEINFO(); }; class OOO_DLLPUBLIC_FILE OOperandRow : public OOperand { - sal_uInt16 m_nRowPos; + sal_uInt16 m_nRowPos; protected: - OValueRefRow m_pRow; + OValueRefRow m_pRow; OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType); public: @@ -352,7 +352,7 @@ namespace connectivity virtual double operate(const double& fLeft,const double& fRight) const; }; - inline sal_Bool OOperand::isValid() const + inline sal_Bool OOperand::isValid() const { return getValue().getDouble() != double(0.0); } diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index 95bdd48eda56..be00efaac15d 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.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 friend class OPredicateInterpreter; friend class OSQLAnalyzer; - OCodeList m_aCodeList; - OFileColumns m_orgColumns; // in filecurs this are the filecolumns - OSQLAnalyzer* m_pAnalyzer; + OCodeList m_aCodeList; + OFileColumns m_orgColumns; // in filecurs this are the filecolumns + OSQLAnalyzer* m_pAnalyzer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xIndexes; - sal_Int32 m_nParamCounter; - sal_Bool m_bORCondition; + sal_Int32 m_nParamCounter; + sal_Bool m_bORCondition; public: OPredicateCompiler(OSQLAnalyzer* pAnalyzer); @@ -77,7 +77,7 @@ namespace connectivity sal_Bool isClean() const {return m_aCodeList.empty();} sal_Bool hasCode() const {return !isClean();} sal_Bool hasORCondition() const {return m_bORCondition;} - void setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; } + void setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; } const OFileColumns getOrigColumns() const { return m_orgColumns; } protected: OOperand* execute_COMPARE(connectivity::OSQLParseNode* pPredicateNode) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -93,27 +93,27 @@ namespace connectivity class OPredicateInterpreter : public ::salhelper::SimpleReferenceObject { - OCodeStack m_aStack; + OCodeStack m_aStack; ::rtl::Reference<OPredicateCompiler> m_rCompiler; public: OPredicateInterpreter(const ::rtl::Reference<OPredicateCompiler>& rComp) : m_rCompiler(rComp){} virtual ~OPredicateInterpreter(); - sal_Bool evaluate(OCodeList& rCodeList); - void evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal); + sal_Bool evaluate(OCodeList& rCodeList); + void evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal); - inline sal_Bool start() - { + inline sal_Bool start() + { return evaluate(m_rCompiler->m_aCodeList); } - inline void startSelection(ORowSetValueDecoratorRef& _rVal) - { + inline void startSelection(ORowSetValueDecoratorRef& _rVal) + { return evaluateSelection(m_rCompiler->m_aCodeList,_rVal); } - + }; } } diff --git a/connectivity/source/inc/file/filedllapi.hxx b/connectivity/source/inc/file/filedllapi.hxx index ac826dc1040e..5c8e3d878e80 100644 --- a/connectivity/source/inc/file/filedllapi.hxx +++ b/connectivity/source/inc/file/filedllapi.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/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx index cd4ace069420..4bcf6e5a0f0f 100644 --- a/connectivity/source/inc/file/quotedstring.hxx +++ b/connectivity/source/inc/file/quotedstring.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 @@ -45,8 +45,8 @@ namespace connectivity QuotedTokenizedString() {} QuotedTokenizedString(const String& _sString) : m_sString(_sString){} - xub_StrLen GetTokenCount( sal_Unicode cTok , sal_Unicode cStrDel ) const; - void GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Unicode cTok = ';', sal_Unicode cStrDel = '\0' ) const; + xub_StrLen GetTokenCount( sal_Unicode cTok , sal_Unicode cStrDel ) const; + void GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Unicode cTok = ';', sal_Unicode cStrDel = '\0' ) const; inline String& GetString() { return m_sString; } inline xub_StrLen Len() const { return m_sString.Len(); } inline operator String&() { return m_sString; } diff --git a/connectivity/source/inc/flat/ECatalog.hxx b/connectivity/source/inc/flat/ECatalog.hxx index 18bf218e2c28..600b7930470e 100644 --- a/connectivity/source/inc/flat/ECatalog.hxx +++ b/connectivity/source/inc/flat/ECatalog.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/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx index 63adc8fffbb4..93f219734992 100644 --- a/connectivity/source/inc/flat/EColumns.hxx +++ b/connectivity/source/inc/flat/EColumns.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/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx index 423e625f3cfd..e70da8152081 100644 --- a/connectivity/source/inc/flat/EConnection.hxx +++ b/connectivity/source/inc/flat/EConnection.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,23 +39,23 @@ namespace connectivity class OFlatConnection : public file::OConnection { private: - sal_Bool m_bHeaderLine; // column names in first row - sal_Unicode m_cFieldDelimiter; // look at the name - sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter - sal_Unicode m_cDecimalDelimiter; // Dezimal-delimiter (Dezimalpoint) - sal_Unicode m_cThousandDelimiter; // + sal_Bool m_bHeaderLine; // column names in first row + sal_Unicode m_cFieldDelimiter; // look at the name + sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter + sal_Unicode m_cDecimalDelimiter; // Dezimal-delimiter (Dezimalpoint) + sal_Unicode m_cThousandDelimiter; // public: - OFlatConnection(ODriver* _pDriver); + OFlatConnection(ODriver* _pDriver); virtual ~OFlatConnection(); virtual void construct(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException); // own methods - inline sal_Bool isHeaderLine() const { return m_bHeaderLine; } - inline sal_Unicode getFieldDelimiter() const { return m_cFieldDelimiter; } - inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } - inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } - inline sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;} + inline sal_Bool isHeaderLine() const { return m_bHeaderLine; } + inline sal_Unicode getFieldDelimiter() const { return m_cFieldDelimiter; } + inline sal_Unicode getStringDelimiter() const { return m_cStringDelimiter; } + inline sal_Unicode getDecimalDelimiter() const { return m_cDecimalDelimiter; } + inline sal_Unicode getThousandDelimiter() const { return m_cThousandDelimiter;} // XServiceInfo DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx index 14400139acf3..c4d0bce60a5e 100644 --- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx +++ b/connectivity/source/inc/flat/EDatabaseMetaData.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 //************ Class: java.sql.DatabaseMetaDataDate //************************************************************** - class OFlatDatabaseMetaData : public file::ODatabaseMetaData + class OFlatDatabaseMetaData : public file::ODatabaseMetaData { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); protected: diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx index 617b4fe47c21..794b4c5da139 100644 --- a/connectivity/source/inc/flat/EDriver.hxx +++ b/connectivity/source/inc/flat/EDriver.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 @@ -47,7 +47,7 @@ namespace connectivity // XInterface static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); + // static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // XDriver diff --git a/connectivity/source/inc/flat/EPreparedStatement.hxx b/connectivity/source/inc/flat/EPreparedStatement.hxx index 16ab510838f2..4304be59f6e9 100644 --- a/connectivity/source/inc/flat/EPreparedStatement.hxx +++ b/connectivity/source/inc/flat/EPreparedStatement.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/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx index 9bafb5d9ecd0..1d0e2eab1af8 100644 --- a/connectivity/source/inc/flat/EResultSet.hxx +++ b/connectivity/source/inc/flat/EResultSet.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 @@ -40,11 +40,11 @@ namespace connectivity class OFlatResultSet; // these typedef's are only necessary for the compiler typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XRowLocate> OFlatResultSet_BASE; - typedef file::OResultSet OFlatResultSet_BASE2; - typedef ::comphelper::OPropertyArrayUsageHelper<OFlatResultSet> OFlatResultSet_BASE3; + typedef file::OResultSet OFlatResultSet_BASE2; + typedef ::comphelper::OPropertyArrayUsageHelper<OFlatResultSet> OFlatResultSet_BASE3; - class OFlatResultSet : public OFlatResultSet_BASE2, + class OFlatResultSet : public OFlatResultSet_BASE2, public OFlatResultSet_BASE, public OFlatResultSet_BASE3 { @@ -57,7 +57,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - OFlatResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); + OFlatResultSet( file::OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/flat/EStatement.hxx b/connectivity/source/inc/flat/EStatement.hxx index c38a7874a101..018b204aae45 100644 --- a/connectivity/source/inc/flat/EStatement.hxx +++ b/connectivity/source/inc/flat/EStatement.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/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index 24b6ba412b59..9702070c2387 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.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,25 +46,25 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed>, comphelper::UStringMixLess > OContainer; typedef ::std::map<sal_Int32, sal_Int32> TRowPositionsInFile; - class OFlatTable : public OFlatTable_BASE + class OFlatTable : public OFlatTable_BASE { // maps a row postion to a file position TRowPositionsInFile m_aFilePosToEndLinePos; - ::std::map<sal_Int32, TRowPositionsInFile::iterator> + ::std::map<sal_Int32, TRowPositionsInFile::iterator> m_aRowPosToFilePos; - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth - ::std::vector<sal_Int32> m_aScales; + ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + ::std::vector<sal_Int32> m_aPrecisions; // same as aboth + ::std::vector<sal_Int32> m_aScales; QuotedTokenizedString m_aCurrentLine; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xNumberFormatter; ::com::sun::star::util::Date m_aNullDate; - sal_Int32 m_nStartRowFilePos; - sal_Int32 m_nRowPos; - sal_Int32 m_nMaxRowCount; // will be set if stream is once eof - sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter - sal_Unicode m_cFieldDelimiter; // look at the name + sal_Int32 m_nStartRowFilePos; + sal_Int32 m_nRowPos; + sal_Int32 m_nMaxRowCount; // will be set if stream is once eof + sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter + sal_Unicode m_cFieldDelimiter; // look at the name bool m_bNeedToReadLine; - private: + private: void fillColumns(const ::com::sun::star::lang::Locale& _aLocale); BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo); sal_Bool readLine(sal_Int32& _rnCurrentPos); @@ -72,7 +72,7 @@ namespace connectivity virtual void refreshColumns(); public: - // DECLARE_CTY_DEFAULTS( OFlatTable_BASE); + // DECLARE_CTY_DEFAULTS( OFlatTable_BASE); OFlatTable( sdbcx::OCollection* _pTables,OFlatConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx index 818dbc8b38e4..75db907662ef 100644 --- a/connectivity/source/inc/flat/ETables.hxx +++ b/connectivity/source/inc/flat/ETables.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/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx index f46e19c022fd..71282008b668 100644 --- a/connectivity/source/inc/hsqldb/HCatalog.hxx +++ b/connectivity/source/inc/hsqldb/HCatalog.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,9 +42,9 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; /** calls XDatabaseMetaData::getTables. - @param _sKindOfObject + @param _sKindOfObject The type of tables to be fetched. - @param _rNames + @param _rNames The container for the names to be filled. */ void refreshObjects(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames); @@ -52,15 +52,15 @@ namespace connectivity public: // implementation of the pure virtual methods virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; public: OHCatalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() const { return m_xConnection; } virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx index 5078e3566bfe..637ea8f2c263 100644 --- a/connectivity/source/inc/hsqldb/HColumns.hxx +++ b/connectivity/source/inc/hsqldb/HColumns.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 protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); public: - OHSQLColumns( ::cppu::OWeakObject& _rParent + OHSQLColumns( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -51,7 +51,7 @@ namespace connectivity typedef sdbcx::OColumn OHSQLColumn_BASE; typedef ::comphelper::OIdPropertyArrayUsageHelper<OHSQLColumn> OHSQLColumn_PROP; - class OHSQLColumn : public OHSQLColumn_BASE, + class OHSQLColumn : public OHSQLColumn_BASE, public OHSQLColumn_PROP { ::rtl::OUString m_sAutoIncrement; diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index ec954c102e9f..50e825c097ea 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.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 @@ -84,7 +84,7 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xORB ); - + // XServiceInfo DECLARE_SERVICE_INFO(); DECLARE_XTYPEPROVIDER() diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 2ef4164899c7..b75c92c46481 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.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,31 +50,31 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODriverDelegator_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XDriver + typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XDriver ,::com::sun::star::sdbcx::XDataDefinitionSupplier , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::sdbcx::XCreateCatalog , ::com::sun::star::embed::XTransactionListener - > ODriverDelegator_BASE; + > ODriverDelegator_BASE; typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,::com::sun::star::uno::WeakReferenceHelper> TWeakRefPair; typedef ::std::pair< ::rtl::OUString ,TWeakRefPair > TWeakConnectionPair; - + typedef ::std::pair< ::com::sun::star::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; typedef ::std::vector< TWeakPair > TWeakPairVector; - + /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. - + */ class ODriverDelegator : public ::comphelper::OBaseMutex ,public ODriverDelegator_BASE { - TWeakPairVector m_aConnections; // vector containing a list + TWeakPairVector m_aConnections; // vector containing a list // of all the Connection objects // for this Driver - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; sal_Bool m_bInShutDownConnections; /** load the driver we want to delegate. @@ -139,7 +139,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_HSQLDB_DRIVER_HXX diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx index 079d8c7d0ec7..b543e09d5c84 100644 --- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx +++ b/connectivity/source/inc/hsqldb/HStorageAccess.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/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx index 5f94b03617da..ee27fff089e1 100644 --- a/connectivity/source/inc/hsqldb/HStorageMap.hxx +++ b/connectivity/source/inc/hsqldb/HStorageMap.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 @@ -45,17 +45,17 @@ namespace connectivity { class StreamHelper { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream> m_xStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> m_xSeek; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> m_xOutputStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> m_xInputStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream> m_xStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> m_xSeek; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> m_xOutputStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> m_xInputStream; public: StreamHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream>& _xStream); ~StreamHelper(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getInputStream(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> getOutputStream(); - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> getSeek(); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream> getInputStream(); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> getOutputStream(); + ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable> getSeek(); }; @@ -83,10 +83,10 @@ namespace connectivity static void throwJavaException(const ::com::sun::star::uno::Exception& _aException,JNIEnv * env); }; //........................................................................ - } // namespace hsqldb + } // namespace hsqldb //........................................................................ //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx index ef11cc13a4df..a59f5b9b3179 100644 --- a/connectivity/source/inc/hsqldb/HTable.hxx +++ b/connectivity/source/inc/hsqldb/HTable.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 @@ -41,33 +41,33 @@ namespace connectivity ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OHSQLTable; - typedef ::comphelper::OIdPropertyArrayUsageHelper< OHSQLTable > OHSQLTable_PROP; - class OHSQLTable : public OTableHelper + typedef ::comphelper::OIdPropertyArrayUsageHelper< OHSQLTable > OHSQLTable_PROP; + class OHSQLTable : public OTableHelper ,public OHSQLTable_PROP { sal_Int32 m_nPrivileges; // we have to set our privileges by our own /** executes the statmenmt. - @param _rStatement + @param _rStatement The statement to execute. */ void executeStatement(const ::rtl::OUString& _rStatement ); protected: /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames); /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames); /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames); @@ -79,15 +79,15 @@ namespace connectivity <BR> as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. - @return an pointer to the newly created array helper. Must not be NULL. + @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); - + public: - OHSQLTable( sdbcx::OCollection* _pTables, + OHSQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - OHSQLTable( sdbcx::OCollection* _pTables, + OHSQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, @@ -108,7 +108,7 @@ namespace connectivity virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); // XAlterTable virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - + // XRename virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index 377868453b6e..baec75504281 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.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 @@ -37,7 +37,7 @@ namespace connectivity class OTables : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - + protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx index aff601e33bd8..2c1b8f4d5f9d 100644 --- a/connectivity/source/inc/hsqldb/HTools.hxx +++ b/connectivity/source/inc/hsqldb/HTools.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/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx index f5df521ade33..d5201c63e87f 100644 --- a/connectivity/source/inc/hsqldb/HUser.hxx +++ b/connectivity/source/inc/hsqldb/HUser.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 @@ -67,7 +67,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + ::rtl::OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx index 0626c92e903c..10bfa31eb2bb 100644 --- a/connectivity/source/inc/hsqldb/HUsers.hxx +++ b/connectivity/source/inc/hsqldb/HUsers.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,7 +42,7 @@ namespace connectivity class OUsers : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - connectivity::sdbcx::IRefreshableUsers* m_pParent; + connectivity::sdbcx::IRefreshableUsers* m_pParent; public: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index 495c63e437cd..51117c991411 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.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 @@ -77,10 +77,10 @@ namespace connectivity { namespace hsqldb /** retrieves the current command of the View @throws ::com::sun::star::lang::WrappedTargetException - if an error occurs while retrieving the command from the database and + if an error occurs while retrieving the command from the database and <arg>_bAllowSQLExceptin</arg> is <FALSE/> @throws ::com::sun::star::sdbc::SQLException - if an error occurs while retrieving the command from the database and + if an error occurs while retrieving the command from the database and <arg>_bAllowSQLException</arg> is <TRUE/> */ ::rtl::OUString impl_getCommand_throw( bool _bAllowSQLException ) const; diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx index a8d9b83c7b17..ee2f61e6ab2d 100644 --- a/connectivity/source/inc/hsqldb/HViews.hxx +++ b/connectivity/source/inc/hsqldb/HViews.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/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx index 08a29151623d..3009dc5992d4 100644 --- a/connectivity/source/inc/internalnode.hxx +++ b/connectivity/source/inc/internalnode.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 /** special node for avoiding memory leaks */ class OSQLInternalNode : public OSQLParseNode - { + { public: OSQLInternalNode(const sal_Char* pNewValue, SQLNodeType eNodeType, @@ -58,6 +58,6 @@ namespace connectivity }; } -#endif //_CONNECTIVITY_SQLINTERNALNODE_HXX +#endif //_CONNECTIVITY_SQLINTERNALNODE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index fc6661c27eaa..f1f49f0af8f6 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.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 @@ -47,7 +47,7 @@ namespace connectivity { namespace jdbc //==================================================================== //= ContextClassLoaderScope //==================================================================== - /** + /** */ class ContextClassLoaderScope { @@ -65,7 +65,7 @@ namespace connectivity { namespace jdbc @param _rxErrorContext the context which should be passed to java_lang_object::ThrowLoggedSQLException in case an error occurs - + */ ContextClassLoaderScope( JNIEnv& environment, diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx index 4aeacbe7b62d..b6db5de5160d 100644 --- a/connectivity/source/inc/java/GlobalRef.hxx +++ b/connectivity/source/inc/java/GlobalRef.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/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx index fb4cb6588635..6f499ced88f7 100644 --- a/connectivity/source/inc/java/LocalRef.hxx +++ b/connectivity/source/inc/java/LocalRef.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/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx index 20837abf136d..5fdb5a5abbd6 100644 --- a/connectivity/source/inc/java/io/InputStream.hxx +++ b/connectivity/source/inc/java/io/InputStream.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 @@ -34,7 +34,7 @@ namespace connectivity { - + //************************************************************** //************ Class: java.io.InputStream //************************************************************** @@ -46,7 +46,7 @@ namespace connectivity static jclass theClass; virtual ~java_io_InputStream(); public: - virtual jclass getMyClass() const; + virtual jclass getMyClass() const; // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_io_InputStream( JNIEnv * pEnv, jobject myObj ); // XInputStream diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx index 0e0a3e3e8f59..74235ff5d328 100644 --- a/connectivity/source/inc/java/io/Reader.hxx +++ b/connectivity/source/inc/java/io/Reader.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 @@ -47,7 +47,7 @@ namespace connectivity virtual ~java_io_Reader(); public: virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_io_Reader( JNIEnv * pEnv, jobject myObj ); // XInputStream diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx index 68b6d9adfe0f..4c036bdf1869 100644 --- a/connectivity/source/inc/java/lang/Boolean.hxx +++ b/connectivity/source/inc/java/lang/Boolean.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 @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_LANG_BOOLEAN_HXX_ -#define _CONNECTIVITY_JAVA_LANG_BOOLEAN_HXX_ +#define _CONNECTIVITY_JAVA_LANG_BOOLEAN_HXX_ #include "java/lang/Object.hxx" //************************************************************** diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx index 69af774a380d..b0ce9983149d 100644 --- a/connectivity/source/inc/java/lang/Class.hxx +++ b/connectivity/source/inc/java/lang/Class.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 @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_LANG_CLASS_HXX_ -#define _CONNECTIVITY_JAVA_LANG_CLASS_HXX_ +#define _CONNECTIVITY_JAVA_LANG_CLASS_HXX_ //************************************************************** //************ Class: java.lang.Class //************************************************************** @@ -48,7 +48,7 @@ namespace connectivity static java_lang_Class * forName( const ::rtl::OUString &_par0 ); // return the jre object jobject newInstanceObject(); - + }; } diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx index 5e4111a54c6e..2eb76b5aef0c 100644 --- a/connectivity/source/inc/java/lang/Exception.hxx +++ b/connectivity/source/inc/java/lang/Exception.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/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index 481f458bc1a6..b017163de77a 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.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 @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ -#define _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ +#define _CONNECTIVITY_JAVA_LANG_OBJECT_HXX_ #if STLPORT_VERSION>=321 // jni.h needs cstdarg for std::va_list @@ -68,8 +68,8 @@ namespace connectivity public: SDBThreadAttach(); ~SDBThreadAttach(); - - JNIEnv* pEnv; + + JNIEnv* pEnv; static void addRef(); static void releaseRef(); @@ -100,7 +100,7 @@ namespace connectivity // Klassendefinition // neu in SJ2: - static jclass theClass; // die Klasse braucht nur einmal angefordert werden ! + static jclass theClass; // die Klasse braucht nur einmal angefordert werden ! virtual jclass getMyClass() const; @@ -113,9 +113,9 @@ namespace connectivity virtual ~java_lang_Object(); - void saveRef( JNIEnv * pEnv, jobject myObj ); - jobject getJavaObject() const { return object; } - java_lang_Object * GetWrapper() { return this; } + void saveRef( JNIEnv * pEnv, jobject myObj ); + jobject getJavaObject() const { return object; } + java_lang_Object * GetWrapper() { return this; } void clearObject(JNIEnv& rEnv); void clearObject(); @@ -149,7 +149,7 @@ namespace connectivity jobject callObjectMethod( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID ) const; jobject callObjectMethodWithIntArg( JNIEnv * pEnv, const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const; - template< typename T > + template< typename T > T callMethodWithIntArg(T (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) ,const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const { SDBThreadAttach t; @@ -159,7 +159,7 @@ namespace connectivity return out; } - template< typename T > + template< typename T > void callVoidMethod(const char* _pMethodName, const char* _pSignature, jmethodID& _inout_MethodID,sal_Int32 _nArgument, const T& _aValue) const { SDBThreadAttach t; @@ -168,7 +168,7 @@ namespace connectivity ThrowSQLException( t.pEnv, NULL ); } - + }; } #endif //_CONNECTIVITY_JAVA_LANG_OBJJECT_HXX_ diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx index 273109fd67f0..f39664e77bc0 100644 --- a/connectivity/source/inc/java/lang/String.hxx +++ b/connectivity/source/inc/java/lang/String.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 @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_LANG_STRING_HXX_ -#define _CONNECTIVITY_JAVA_LANG_STRING_HXX_ +#define _CONNECTIVITY_JAVA_LANG_STRING_HXX_ #include "java/lang/Object.hxx" diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx index 09b047ddf1ba..9915adbea720 100644 --- a/connectivity/source/inc/java/lang/Throwable.hxx +++ b/connectivity/source/inc/java/lang/Throwable.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/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx index 86cd9d57f9bd..39f02eca4115 100644 --- a/connectivity/source/inc/java/math/BigDecimal.hxx +++ b/connectivity/source/inc/java/math/BigDecimal.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 @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_MATH_BIGDECIMAL_HXX_ -#define _CONNECTIVITY_JAVA_MATH_BIGDECIMAL_HXX_ +#define _CONNECTIVITY_JAVA_MATH_BIGDECIMAL_HXX_ #include "java/lang/Object.hxx" //************************************************************** diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx index ecfd94799513..b3e6d4ffa078 100644 --- a/connectivity/source/inc/java/sql/Array.hxx +++ b/connectivity/source/inc/java/sql/Array.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 @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_ARRAY_HXX_ -#define _CONNECTIVITY_JAVA_SQL_ARRAY_HXX_ +#define _CONNECTIVITY_JAVA_SQL_ARRAY_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XArray.hpp> @@ -38,7 +38,7 @@ namespace connectivity //************************************************************** //************ Class: java.sql.SQLWarning //************************************************************** - class java_sql_Array : public java_lang_Object, + class java_sql_Array : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XArray> { protected: diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx index da44418533c1..754b38b09eef 100644 --- a/connectivity/source/inc/java/sql/Blob.hxx +++ b/connectivity/source/inc/java/sql/Blob.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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_BLOB_HXX_ -#define _CONNECTIVITY_JAVA_SQL_BLOB_HXX_ +#define _CONNECTIVITY_JAVA_SQL_BLOB_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XBlob.hpp> @@ -39,7 +39,7 @@ namespace connectivity //************************************************************** //************ Class: java.sql.SQLWarning //************************************************************** - class java_sql_Blob : public java_lang_Object, + class java_sql_Blob : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XBlob> { protected: @@ -48,7 +48,7 @@ namespace connectivity virtual ~java_sql_Blob(); public: virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_Blob( JNIEnv * pEnv, jobject myObj ); diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx index 1269af2543bf..00fd44c6fbed 100644 --- a/connectivity/source/inc/java/sql/CallableStatement.hxx +++ b/connectivity/source/inc/java/sql/CallableStatement.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 //************ Class: java.sql.CallableStatement //************************************************************** - class java_sql_CallableStatement : public java_sql_PreparedStatement, + class java_sql_CallableStatement : public java_sql_PreparedStatement, public ::com::sun::star::sdbc::XRow, public ::com::sun::star::sdbc::XOutParameters { @@ -52,7 +52,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const ::rtl::OUString& sql ); diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx index 1b861eeebed7..01265210c30d 100644 --- a/connectivity/source/inc/java/sql/Clob.hxx +++ b/connectivity/source/inc/java/sql/Clob.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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_CLOB_HXX_ -#define _CONNECTIVITY_JAVA_SQL_CLOB_HXX_ +#define _CONNECTIVITY_JAVA_SQL_CLOB_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XClob.hpp> @@ -39,7 +39,7 @@ namespace connectivity //************************************************************** //************ Class: java.sql.SQLWarning //************************************************************** - class java_sql_Clob : public java_lang_Object, + class java_sql_Clob : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XClob> { protected: diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx index 899e89b86afc..211e950a883b 100644 --- a/connectivity/source/inc/java/sql/Connection.hxx +++ b/connectivity/source/inc/java/sql/Connection.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 { class java_sql_Driver; - typedef OMetaConnection java_sql_Connection_BASE; + typedef OMetaConnection java_sql_Connection_BASE; class java_sql_Connection : public java_sql_Connection_BASE, public java_lang_Object, @@ -52,22 +52,22 @@ namespace connectivity public OAutoRetrievingBase { friend class OSubComponent<java_sql_Connection, java_sql_Connection_BASE>; - const java_sql_Driver* m_pDriver; - jobject m_pDriverobject; + const java_sql_Driver* m_pDriver; + jobject m_pDriverobject; jdbc::GlobalRef< jobject > m_pDriverClassLoader; - jclass m_Driver_theClass; + jclass m_Driver_theClass; java::sql::ConnectionLog m_aLogger; - sal_Bool m_bParameterSubstitution; - sal_Bool m_bIgnoreDriverPrivileges; - sal_Bool m_bIgnoreCurrency; + sal_Bool m_bParameterSubstitution; + sal_Bool m_bIgnoreDriverPrivileges; + sal_Bool m_bIgnoreCurrency; ::com::sun::star::uno::Any m_aCatalogRestriction; ::com::sun::star::uno::Any m_aSchemaRestriction; /** transform named parameter into unnamed one. - @param _sSQL + @param _sSQL The SQL statement to transform. @return The new statement witgh unnamed parameters. @@ -92,18 +92,18 @@ namespace connectivity public: virtual jclass getMyClass() const; - + DECLARE_SERVICE_INFO(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_Connection( const java_sql_Driver& _rDriver ); - sal_Bool construct( const ::rtl::OUString& url, + sal_Bool construct( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info); const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& getConnectionInfo() const { return m_aConnectionInfo; } - inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} - inline sal_Bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } + inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges;} + inline sal_Bool isIgnoreCurrencyEnabled() const { return m_bIgnoreCurrency; } inline const ::com::sun::star::uno::Any& getCatalogRestriction() const { return m_aCatalogRestriction; } inline const ::com::sun::star::uno::Any& getSchemaRestriction() const { return m_aSchemaRestriction; } diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx index 4985aa244eb6..74bddcd5b9e7 100644 --- a/connectivity/source/inc/java/sql/ConnectionLog.hxx +++ b/connectivity/source/inc/java/sql/ConnectionLog.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/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx index 04e85349440e..e0bd590cc1b7 100644 --- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx +++ b/connectivity/source/inc/java/sql/DatabaseMetaData.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/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx index 4e4b9e8ab7e3..508429c301c0 100644 --- a/connectivity/source/inc/java/sql/Driver.hxx +++ b/connectivity/source/inc/java/sql/Driver.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/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx index 3b54087b7e9e..0e6955aa71a3 100644 --- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx +++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_DRIVERPOPERTYINFO_HXX_ -#define _CONNECTIVITY_JAVA_SQL_DRIVERPOPERTYINFO_HXX_ +#define _CONNECTIVITY_JAVA_SQL_DRIVERPOPERTYINFO_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/DriverPropertyInfo.hpp> @@ -53,7 +53,7 @@ namespace connectivity ::rtl::OUString name(); ::rtl::OUString description(); ::rtl::OUString value(); - sal_Bool required(); + sal_Bool required(); ::com::sun::star::uno::Sequence< ::rtl::OUString> choices(); }; } diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index f621f9ce2869..39f232c8d5ba 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.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,17 +62,17 @@ namespace connectivity //************ Class: java.sql.Statement //************************************************************** class java_sql_Statement_Base : public comphelper::OBaseMutex, - public java_sql_Statement_BASE, - public java_lang_Object, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<java_sql_Statement_Base> + public java_sql_Statement_BASE, + public java_lang_Object, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<java_sql_Statement_Base> { sal_Int32 getQueryTimeOut() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getMaxFieldSize() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getMaxRows() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getResultSetConcurrency() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getResultSetConcurrency() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getResultSetType() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchDirection() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getFetchSize() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -89,13 +89,13 @@ namespace connectivity void setEscapeProcessing(sal_Bool _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; - java_sql_Connection* m_pConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; + java_sql_Connection* m_pConnection; java::sql::ConnectionLog m_aLogger; - ::rtl::OUString m_sSqlStatement; + ::rtl::OUString m_sSqlStatement; // Properties - sal_Int32 m_nResultSetConcurrency; - sal_Int32 m_nResultSetType; + sal_Int32 m_nResultSetConcurrency; + sal_Int32 m_nResultSetType; sal_Bool m_bEscapeProcessing; ::cppu::OBroadcastHelper& rBHelper; @@ -174,7 +174,7 @@ namespace connectivity using ::cppu::OPropertySetHelper::getFastPropertyValue; }; - class OStatement_BASE2 :public java_sql_Statement_Base + class OStatement_BASE2 :public java_sql_Statement_Base ,public OSubComponent<OStatement_BASE2, java_sql_Statement_BASE> { @@ -189,7 +189,7 @@ namespace connectivity virtual void SAL_CALL release() throw(); }; - class java_sql_Statement : public OStatement_BASE2, + class java_sql_Statement : public OStatement_BASE2, public ::com::sun::star::sdbc::XBatchExecution, public ::com::sun::star::lang::XServiceInfo { diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx index 6042c3cbf7f8..0e3932cfc22d 100644 --- a/connectivity/source/inc/java/sql/PreparedStatement.hxx +++ b/connectivity/source/inc/java/sql/PreparedStatement.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 @@ -31,7 +31,7 @@ #include "java/sql/JStatement.hxx" #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> -// #include <com/sun/star/sdbc/XClearParameters.hpp> +// #include <com/sun/star/sdbc/XClearParameters.hpp> #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -42,7 +42,7 @@ namespace connectivity //************ Class: java.sql.PreparedStatement //************************************************************** - class java_sql_PreparedStatement : public OStatement_BASE2, + class java_sql_PreparedStatement : public OStatement_BASE2, public ::com::sun::star::sdbc::XPreparedStatement, public ::com::sun::star::sdbc::XResultSetMetaDataSupplier, public ::com::sun::star::sdbc::XParameters, @@ -58,7 +58,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const ::rtl::OUString& sql ); diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx index f7410d46e2c8..d4479be3bb35 100644 --- a/connectivity/source/inc/java/sql/Ref.hxx +++ b/connectivity/source/inc/java/sql/Ref.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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_REF_HXX_ -#define _CONNECTIVITY_JAVA_SQL_REF_HXX_ +#define _CONNECTIVITY_JAVA_SQL_REF_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/sdbc/XRef.hpp> @@ -38,7 +38,7 @@ namespace connectivity //************************************************************** //************ Class: java.sql.Ref //************************************************************** - class java_sql_Ref : public java_lang_Object, + class java_sql_Ref : public java_lang_Object, public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRef> { protected: @@ -47,7 +47,7 @@ namespace connectivity virtual ~java_sql_Ref(); public: virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_Ref( JNIEnv * pEnv, jobject myObj ); diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 272661bdf30d..5764fec3cff2 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.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,7 +49,7 @@ namespace connectivity { /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper10< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -63,22 +63,22 @@ namespace connectivity ::com::sun::star::lang::XServiceInfo> java_sql_ResultSet_BASE; class java_sql_Connection; - class java_sql_ResultSet : public comphelper::OBaseMutex, - public java_sql_ResultSet_BASE, - public java_lang_Object, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<java_sql_ResultSet> + class java_sql_ResultSet : public comphelper::OBaseMutex, + public java_sql_ResultSet_BASE, + public java_lang_Object, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<java_sql_ResultSet> { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; java::sql::ConnectionLog m_aLogger; - java_sql_Connection* m_pConnection; + java_sql_Connection* m_pConnection; sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -109,7 +109,7 @@ namespace connectivity virtual ~java_sql_ResultSet(); public: DECLARE_SERVICE_INFO(); - virtual jclass getMyClass() const; + virtual jclass getMyClass() const; // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rParentLogger,java_sql_Connection& _rConnection, java_sql_Statement_Base* pStmt = NULL ); diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx index e859afee76de..c0f43cbb8d5e 100644 --- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx +++ b/connectivity/source/inc/java/sql/ResultSetMetaData.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 { protected: java::sql::ConnectionLog m_aLogger; - java_sql_Connection* m_pConnection; + java_sql_Connection* m_pConnection; sal_Int32 m_nColumnCount; // statische Daten fuer die Klasse @@ -52,7 +52,7 @@ namespace connectivity virtual ~java_sql_ResultSetMetaData(); public: virtual jclass getMyClass() const; - + // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_ResultSetMetaData( JNIEnv * pEnv, jobject myObj, const java::sql::ConnectionLog& _rResultSetLogger, java_sql_Connection& _rCon ); diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx index 21822162ef5f..6ff404cbef65 100644 --- a/connectivity/source/inc/java/sql/SQLException.hxx +++ b/connectivity/source/inc/java/sql/SQLException.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 @@ -33,12 +33,12 @@ namespace connectivity { - namespace starsdbc = ::com::sun::star::sdbc; + namespace starsdbc = ::com::sun::star::sdbc; //************************************************************** //************ Class: java.sql.SQLException //************************************************************** class java_sql_SQLException_BASE; - class java_sql_SQLException : public starsdbc::SQLException + class java_sql_SQLException : public starsdbc::SQLException { public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: @@ -46,7 +46,7 @@ namespace connectivity java_sql_SQLException( const java_sql_SQLException_BASE& _rException,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext); }; - class java_sql_SQLException_BASE : public java_lang_Exception + class java_sql_SQLException_BASE : public java_lang_Exception { protected: // statische Daten fuer die Klasse @@ -56,14 +56,14 @@ namespace connectivity virtual ~java_sql_SQLException_BASE(); // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_sql_SQLException_BASE( JNIEnv * pEnv, jobject myObj ); - + ::rtl::OUString getSQLState() const; - sal_Int32 getErrorCode() const; + sal_Int32 getErrorCode() const; starsdbc::SQLException getNextException() const; static jclass st_getMyClass(); }; - + } #endif // _CONNECTIVITY_JAVA_SQL_SQLEXCEPTION_HXX_ diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx index c77c0e9f6ee9..8026d0ac5f94 100644 --- a/connectivity/source/inc/java/sql/SQLWarning.hxx +++ b/connectivity/source/inc/java/sql/SQLWarning.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 @@ -33,8 +33,8 @@ namespace connectivity { - // namespace starsdbc = ::com::sun::star::sdbc; - // namespace ::com::sun::star::uno = ::com::sun::star::uno; + // namespace starsdbc = ::com::sun::star::sdbc; + // namespace ::com::sun::star::uno = ::com::sun::star::uno; //************************************************************** //************ Class: java.sql.SQLWarning //************************************************************** @@ -54,7 +54,7 @@ namespace connectivity class java_sql_SQLWarning : public java_sql_SQLException { public: - java_sql_SQLWarning(const java_sql_SQLWarning_BASE& _rW,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext) + java_sql_SQLWarning(const java_sql_SQLWarning_BASE& _rW,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext) : java_sql_SQLException(_rW,_rContext) {} }; } diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx index e849178cfe87..ce3908fb4779 100644 --- a/connectivity/source/inc/java/sql/Timestamp.hxx +++ b/connectivity/source/inc/java/sql/Timestamp.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 @@ -26,7 +26,7 @@ * ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_SQL_TIMESTAMP_HXX_ -#define _CONNECTIVITY_JAVA_SQL_TIMESTAMP_HXX_ +#define _CONNECTIVITY_JAVA_SQL_TIMESTAMP_HXX_ #include "java/util/Date.hxx" #include <com/sun/star/util/Time.hpp> diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx index 6a0982fa0211..7924edba027e 100644 --- a/connectivity/source/inc/java/tools.hxx +++ b/connectivity/source/inc/java/tools.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,11 +74,11 @@ namespace connectivity jobject convertTypeMapToJavaMap(JNIEnv *pEnv,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & _rMap); /** return if a exception occured - @param pEnv + @param pEnv The native java env - @param _bClear + @param _bClear <TRUE/> if the execption should be cleared - @return + @return <TRUE/> if an exception is occured */ sal_Bool isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear); diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx index d7be97f33519..7c8c7a9811dc 100644 --- a/connectivity/source/inc/java/util/Date.hxx +++ b/connectivity/source/inc/java/util/Date.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 @@ -27,7 +27,7 @@ ************************************************************************/ #ifndef _CONNECTIVITY_JAVA_UTIL_DATE_HXX_ -#define _CONNECTIVITY_JAVA_UTIL_DATE_HXX_ +#define _CONNECTIVITY_JAVA_UTIL_DATE_HXX_ #include "java/lang/Object.hxx" #include <com/sun/star/util/Date.hpp> diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx index b31961b7e46f..b3de8690c5ee 100644 --- a/connectivity/source/inc/java/util/Property.hxx +++ b/connectivity/source/inc/java/util/Property.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/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx index 42e884619163..e07fce0cd3f2 100644 --- a/connectivity/source/inc/mysql/YCatalog.hxx +++ b/connectivity/source/inc/mysql/YCatalog.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,9 +43,9 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; /** calls XDatabaseMetaData::getTables. - @param _sKindOfObject + @param _sKindOfObject The type of tables to be fetched. - @param _rNames + @param _rNames The container for the names to be filled. <OUT/> */ void refreshObjects(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames); @@ -53,15 +53,15 @@ namespace connectivity public: // implementation of the pure virtual methods virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; public: OMySQLCatalog(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + inline sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + inline sdbcx::OCollection* getPrivateViews() const { return m_pViews; } inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() const { return m_xConnection; } virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx index 85c3b3b5eb7b..a9573a35d581 100644 --- a/connectivity/source/inc/mysql/YColumns.hxx +++ b/connectivity/source/inc/mysql/YColumns.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 protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); public: - OMySQLColumns( ::cppu::OWeakObject& _rParent + OMySQLColumns( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -51,7 +51,7 @@ namespace connectivity typedef sdbcx::OColumn OMySQLColumn_BASE; typedef ::comphelper::OIdPropertyArrayUsageHelper<OMySQLColumn> OMySQLColumn_PROP; - class OMySQLColumn : public OMySQLColumn_BASE, + class OMySQLColumn : public OMySQLColumn_BASE, public OMySQLColumn_PROP { ::rtl::OUString m_sAutoIncrement; diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 770afe34702e..ab523896f688 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.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,29 +63,29 @@ namespace connectivity D_JDBC, D_NATIVE } T_DRIVERTYPE; - + /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. - + */ class ODriverDelegator : public ::comphelper::OBaseMutex ,public ODriverDelegator_BASE { - TJDBCDrivers m_aJdbcDrivers; // all jdbc drivers - TWeakPairVector m_aConnections; // vector containing a list + TJDBCDrivers m_aJdbcDrivers; // all jdbc drivers + TWeakPairVector m_aConnections; // vector containing a list // of all the Connection objects // for this Driver - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xODBCDriver; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xNativeDriver; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; - ::rtl::OUString m_sOldDriverClass; - T_DRIVERTYPE m_eDriverType; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xODBCDriver; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xNativeDriver; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + ::rtl::OUString m_sOldDriverClass; + T_DRIVERTYPE m_eDriverType; /** load the driver we want to delegate. The <member>m_xODBCDriver</member> or <member>m_xDBCDriver</member> may be <NULL/> if the driver could not be loaded. - @param url + @param url The URL. - @param info + @param info The property info contains which driver we have to delegate. @return The driver which was currently selected. @@ -121,7 +121,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_MYSQL_DRIVER_HXX diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx index e5b44479ee14..8c718f9b06a9 100644 --- a/connectivity/source/inc/mysql/YTable.hxx +++ b/connectivity/source/inc/mysql/YTable.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 @@ -41,33 +41,33 @@ namespace connectivity ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); class OMySQLTable; - typedef ::comphelper::OIdPropertyArrayUsageHelper< OMySQLTable > OMySQLTable_PROP; - class OMySQLTable : public OTableHelper + typedef ::comphelper::OIdPropertyArrayUsageHelper< OMySQLTable > OMySQLTable_PROP; + class OMySQLTable : public OTableHelper ,public OMySQLTable_PROP { sal_Int32 m_nPrivileges; // we have to set our privileges by our own /** executes the statmenmt. - @param _rStatement + @param _rStatement The statement to execute. */ void executeStatement(const ::rtl::OUString& _rStatement ); protected: /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames); /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames); /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames); @@ -86,15 +86,15 @@ namespace connectivity <BR> as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. - @return an pointer to the newly created array helper. Must not be NULL. + @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); - + public: - OMySQLTable( sdbcx::OCollection* _pTables, + OMySQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection); - OMySQLTable( sdbcx::OCollection* _pTables, + OMySQLTable( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx index 7a3d62afa48f..72d654137cdb 100644 --- a/connectivity/source/inc/mysql/YTables.hxx +++ b/connectivity/source/inc/mysql/YTables.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 public ::dbtools::ISQLStatementHelper { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - + protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx index 145fffc7a815..bdc0ee8b1e05 100644 --- a/connectivity/source/inc/mysql/YUser.hxx +++ b/connectivity/source/inc/mysql/YUser.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 @@ -67,7 +67,7 @@ namespace connectivity public OUserExtend_PROP { protected: - ::rtl::OUString m_Password; + ::rtl::OUString m_Password; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; // OPropertySetHelper diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx index c7d71a897c67..59c5189122f0 100644 --- a/connectivity/source/inc/mysql/YUsers.hxx +++ b/connectivity/source/inc/mysql/YUsers.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,7 +42,7 @@ namespace connectivity class OUsers : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - connectivity::sdbcx::IRefreshableUsers* m_pParent; + connectivity::sdbcx::IRefreshableUsers* m_pParent; public: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx index 038acfe5353b..fdd95845eb9f 100644 --- a/connectivity/source/inc/mysql/YViews.hxx +++ b/connectivity/source/inc/mysql/YViews.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 { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; sal_Bool m_bInDrop; - // OCatalog* m_pParent; + // OCatalog* m_pParent; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index 2310a2e9352b..5817aac1078b 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.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,7 +42,7 @@ namespace connectivity OBoundParam() { paramLength = NULL; - binaryData = NULL; + binaryData = NULL; pA1=0; pA2=0; pB1=0; @@ -185,10 +185,10 @@ namespace connectivity // Data attributes //==================================================================== - sal_Int8* binaryData; // Storage area to be used + sal_Int8* binaryData; // Storage area to be used // when binding the parameter - sal_Int8* paramLength; // Storage area to be used + sal_Int8* paramLength; // Storage area to be used // for the bound length of the // parameter. Note that this // data is in native format. @@ -200,12 +200,12 @@ namespace connectivity // input stream is saved // until needed. - sal_Int32 paramInputStreamLen; // Length of input stream + sal_Int32 paramInputStreamLen; // Length of input stream sal_Int32 sqlType; // Java SQL type used to // register an OUT parameter - sal_Bool outputParameter; // true for OUTPUT parameters + sal_Bool outputParameter; // true for OUTPUT parameters sal_Int32 pA1; //pointers diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index c5dbe644705b..4b6f6b108187 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.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 @@ -53,7 +53,7 @@ namespace connectivity class ODatabaseMetaData; typedef connectivity::OMetaConnection OConnection_BASE; - typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; + typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; class OOO_DLLPUBLIC_ODBCBASE OConnection : public OConnection_BASE, @@ -66,40 +66,40 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - ::std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connectionas which are need for serveral statements - TTypeInfoVector m_aTypeInfo; // vector containing an entry + ::std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connectionas which are need for serveral statements + TTypeInfoVector m_aTypeInfo; // vector containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. - + ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by // an operation - ::rtl::OUString m_sUser; // the user name - ODBCDriver* m_pDriver; // Pointer to the owning + ::rtl::OUString m_sUser; // the user name + ODBCDriver* m_pDriver; // Pointer to the owning // driver object - - SQLHANDLE m_aConnectionHandle; - SQLHANDLE m_pDriverHandleCopy; // performance reason - sal_Int32 m_nStatementCount; - sal_Bool m_bClosed; - sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases - sal_Bool m_bUseOldDateFormat; - sal_Bool m_bParameterSubstitution; - sal_Bool m_bIgnoreDriverPrivileges; + + SQLHANDLE m_aConnectionHandle; + SQLHANDLE m_pDriverHandleCopy; // performance reason + sal_Int32 m_nStatementCount; + sal_Bool m_bClosed; + sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases + sal_Bool m_bUseOldDateFormat; + sal_Bool m_bParameterSubstitution; + sal_Bool m_bIgnoreDriverPrivileges; sal_Bool m_bPreventGetVersionColumns; // #i60273# sal_Bool m_bReadOnly; - SQLRETURN OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent); - - virtual OConnection* cloneConnection(); // creates a new connection + SQLRETURN OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent); + virtual OConnection* cloneConnection(); // creates a new connection + public: oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const; virtual SQLRETURN Construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); - OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver); - // OConnection(const SQLHANDLE _pConnectionHandle); + OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver); + // OConnection(const SQLHANDLE _pConnectionHandle); virtual ~OConnection(); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); @@ -136,24 +136,24 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // - SQLHANDLE getConnection() { return m_aConnectionHandle; } - + SQLHANDLE getConnection() { return m_aConnectionHandle; } + // should we use the catalog on filebased databases - inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; } - inline sal_Bool isParameterSubstitutionEnabled() const { return m_bParameterSubstitution; } - inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges; } + inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; } + inline sal_Bool isParameterSubstitutionEnabled() const { return m_bParameterSubstitution; } + inline sal_Bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges; } inline sal_Bool preventGetVersionColumns() const { return m_bPreventGetVersionColumns; } - inline sal_Bool useOldDateFormat() const { return m_bUseOldDateFormat; } - inline SQLHANDLE getDriverHandle() const { return m_pDriverHandleCopy;} - inline ODBCDriver* getDriver() const { return m_pDriver;} - inline ::rtl::OUString getUserName() const { return m_sUser; } + inline sal_Bool useOldDateFormat() const { return m_bUseOldDateFormat; } + inline SQLHANDLE getDriverHandle() const { return m_pDriverHandleCopy;} + inline ODBCDriver* getDriver() const { return m_pDriver;} + inline ::rtl::OUString getUserName() const { return m_sUser; } - SQLHANDLE createStatementHandle(); + SQLHANDLE createStatementHandle(); // close and free the handle and set it to SQL_NULLHANDLE - void freeStatementHandle(SQLHANDLE& _pHandle); + void freeStatementHandle(SQLHANDLE& _pHandle); void buildTypeInfo() throw( ::com::sun::star::sdbc::SQLException); - const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; } + const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; } }; } } diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx index 08d4f91f3a94..ab4eddfa53e6 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaData.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,10 +44,10 @@ namespace connectivity class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaData : public ODatabaseMetaDataBase { - SQLHANDLE m_aConnectionHandle; - OConnection* m_pConnection; - sal_Bool m_bUseCatalog; - sal_Bool m_bOdbc3; + SQLHANDLE m_aConnectionHandle; + OConnection* m_pConnection; + sal_Bool m_bUseCatalog; + sal_Bool m_bOdbc3; // cached database information virtual ::rtl::OUString impl_getIdentifierQuoteString_throw( ); @@ -76,9 +76,9 @@ namespace connectivity } ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon); + - - + // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -101,10 +101,10 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -140,12 +140,12 @@ namespace connectivity virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 1ae6042ca04f..8851f1f56efc 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.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 @@ -52,9 +52,9 @@ namespace connectivity { class ODatabaseMetaDataResultSetMetaData; /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ - typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, + typedef ::cppu::WeakComponentImplHelper7< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::util::XCancellable, @@ -64,43 +64,43 @@ namespace connectivity class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, - public ODatabaseMetaDataResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> + public ODatabaseMetaDataResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { - ::connectivity::TIntVector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::connectivity::TIntVector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime - ::std::map<sal_Int32, ::connectivity::TInt2IntMap > m_aValueRange; - ::std::map<sal_Int32, ::connectivity::TString2IntMap > m_aStrValueRange; + ::std::map<sal_Int32, ::connectivity::TInt2IntMap > m_aValueRange; + ::std::map<sal_Int32, ::connectivity::TString2IntMap > m_aStrValueRange; - ::std::map<sal_Int32, ::connectivity::TInt2StringMap > m_aIntValueRange; - ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; + ::std::map<sal_Int32, ::connectivity::TInt2StringMap > m_aIntValueRange; + ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; - SQLHANDLE m_aStatementHandle; - SQLHANDLE m_aConnectionHandle; - ::com::sun::star::uno::WeakReferenceHelper m_aStatement; + SQLHANDLE m_aStatementHandle; + SQLHANDLE m_aConnectionHandle; + ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - SQLUSMALLINT* m_pRowStatusArray; - OConnection* m_pConnection; - rtl_TextEncoding m_nTextEncoding; - sal_Int32 m_nRowPos; - sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are - sal_Int32 m_nDriverColumnCount; // column count of the driver wich can sometimes be less than the metadata count - SQLRETURN m_nCurrentFetchState; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; // after last record - sal_Bool m_bFreeHandle; + SQLUSMALLINT* m_pRowStatusArray; + OConnection* m_pConnection; + rtl_TextEncoding m_nTextEncoding; + sal_Int32 m_nRowPos; + sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are + sal_Int32 m_nDriverColumnCount; // column count of the driver wich can sometimes be less than the metadata count + SQLRETURN m_nCurrentFetchState; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; // after last record + sal_Bool m_bFreeHandle; // set the columncount of the driver void checkColumnCount(); sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex); - sal_Int32 mapColumn (sal_Int32 column); + sal_Int32 mapColumn (sal_Int32 column); protected: diff --git a/connectivity/source/inc/odbc/ODefs3.hxx b/connectivity/source/inc/odbc/ODefs3.hxx index 4eec4e8157c4..29a56fe4c4b9 100644 --- a/connectivity/source/inc/odbc/ODefs3.hxx +++ b/connectivity/source/inc/odbc/ODefs3.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/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index 7b28a196ee72..abdf59496496 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.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,17 +46,17 @@ namespace connectivity class OOO_DLLPUBLIC_ODBCBASE SAL_NO_VTABLE ODBCDriver : public ODriver_BASE { protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; - connectivity::OWeakRefArray m_xConnections; // vector containing a list + connectivity::OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; - SQLHANDLE m_pDriverHandle; - - virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath) = 0; + SQLHANDLE m_pDriverHandle; + virtual SQLHANDLE EnvironmentHandle(::rtl::OUString &_rPath) = 0; + public: ODBCDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index e0ffbe91b6fc..c5874e61a864 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.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 @@ -77,7 +77,7 @@ // odbcstub definiert die in den Quellen benutzten NSQL...-Methoden // als indirekte Funktionsaufrufe. // odbcimp zieht sich selbst preos2, odbc und postos2 an. -// #include "odbc3imp.hxx" +// #include "odbc3imp.hxx" #else @@ -107,7 +107,7 @@ #define SQL_FETCH_PRIOR SQL_FETCH_PREV #define SQL_NO_TOTAL (-4) -// #include "odbc3defs.hxx" +// #include "odbc3defs.hxx" #endif @@ -142,10 +142,10 @@ // definiert. #define SDB_ODBC_CHAR UCHAR -#define SQL_WCHAR (-8) -#define SQL_WVARCHAR (-9) -#define SQL_WLONGVARCHAR (-10) -#define SQL_C_WCHAR SQL_WCHAR +#define SQL_WCHAR (-8) +#define SQL_WVARCHAR (-9) +#define SQL_WLONGVARCHAR (-10) +#define SQL_C_WCHAR SQL_WCHAR #endif // UNX @@ -153,22 +153,22 @@ //-------------------------------------------------------------------------- #ifndef SQL_WCHAR -#define SQL_WCHAR (-8) +#define SQL_WCHAR (-8) #endif #ifndef SQL_WVARCHAR -#define SQL_WVARCHAR (-9) +#define SQL_WVARCHAR (-9) #endif #ifndef SQL_WLONGVARCHAR -#define SQL_WLONGVARCHAR (-10) +#define SQL_WLONGVARCHAR (-10) #endif #ifndef SQL_C_WCHAR -#define SQL_C_WCHAR SQL_WCHAR +#define SQL_C_WCHAR SQL_WCHAR #endif #ifdef UNICODE -#define SQL_C_TCHAR SQL_C_WCHAR +#define SQL_C_TCHAR SQL_C_WCHAR #else -#define SQL_C_TCHAR SQL_C_CHAR +#define SQL_C_TCHAR SQL_C_CHAR #endif #endif // _CONNECTIVITY_OFUNCTIONDEFS_HXX_ diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx index fc61134bae74..6e53f332b5e2 100644 --- a/connectivity/source/inc/odbc/OFunctions.hxx +++ b/connectivity/source/inc/odbc/OFunctions.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 @@ -36,518 +36,518 @@ namespace connectivity { -// sal_Bool LoadFunctions(oslModule pODBCso, sal_Bool _bDS=sal_True); -// sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath); -// sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath); +// sal_Bool LoadFunctions(oslModule pODBCso, sal_Bool _bDS=sal_True); +// sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath); +// sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath); // Connecting to a data source - typedef SQLRETURN (SQL_API *T3SQLAllocHandle) (SQLSMALLINT HandleType,SQLHANDLE InputHandle,SQLHANDLE * OutputHandlePtr); + typedef SQLRETURN (SQL_API *T3SQLAllocHandle) (SQLSMALLINT HandleType,SQLHANDLE InputHandle,SQLHANDLE * OutputHandlePtr); #define N3SQLAllocHandle(a,b,c) (*(T3SQLAllocHandle)getOdbcFunction(ODBC3SQLAllocHandle))(a,b,c) - typedef SQLRETURN (SQL_API *T3SQLConnect) (SQLHDBC ConnectionHandle,SQLCHAR *ServerName,SQLSMALLINT NameLength1,SQLCHAR *UserName,SQLSMALLINT NameLength2,SQLCHAR *Authentication,SQLSMALLINT NameLength3); + typedef SQLRETURN (SQL_API *T3SQLConnect) (SQLHDBC ConnectionHandle,SQLCHAR *ServerName,SQLSMALLINT NameLength1,SQLCHAR *UserName,SQLSMALLINT NameLength2,SQLCHAR *Authentication,SQLSMALLINT NameLength3); #define N3SQLConnect(a,b,c,d,e,f,g) (*(T3SQLConnect)getOdbcFunction(ODBC3SQLConnect))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLDriverConnect) ( SQLHDBC ConnectionHandle, - HWND WindowHandle, - SQLCHAR * InConnectionString, - SQLSMALLINT StringLength1, - SQLCHAR * OutConnectionString, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength2Ptr, - SQLUSMALLINT DriverCompletion); + typedef SQLRETURN (SQL_API *T3SQLDriverConnect) ( SQLHDBC ConnectionHandle, + HWND WindowHandle, + SQLCHAR * InConnectionString, + SQLSMALLINT StringLength1, + SQLCHAR * OutConnectionString, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLength2Ptr, + SQLUSMALLINT DriverCompletion); #define N3SQLDriverConnect(a,b,c,d,e,f,g,h) (*(T3SQLDriverConnect)getOdbcFunction(ODBC3SQLDriverConnect))(a,b,c,d,e,f,g,h) - typedef SQLRETURN (SQL_API *T3SQLBrowseConnect) ( SQLHDBC ConnectionHandle, - SQLCHAR * InConnectionString, - SQLSMALLINT StringLength1, - SQLCHAR * OutConnectionString, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLength2Ptr); + typedef SQLRETURN (SQL_API *T3SQLBrowseConnect) ( SQLHDBC ConnectionHandle, + SQLCHAR * InConnectionString, + SQLSMALLINT StringLength1, + SQLCHAR * OutConnectionString, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLength2Ptr); #define N3SQLBrowseConnect(a,b,c,d,e,f) (*(T3SQLBrowseConnect)getOdbcFunction(ODBC3SQLBrowseConnect))(a,b,c,d,e,f) // Obtaining information about a driver and data source - typedef SQLRETURN (SQL_API *T3SQLDataSources) ( SQLHENV EnvironmentHandle, - SQLUSMALLINT Direction, - SQLCHAR * ServerName, - SQLSMALLINT BufferLength1, - SQLSMALLINT * NameLength1Ptr, - SQLCHAR * Description, - SQLSMALLINT BufferLength2, - SQLSMALLINT * NameLength2Ptr); + typedef SQLRETURN (SQL_API *T3SQLDataSources) ( SQLHENV EnvironmentHandle, + SQLUSMALLINT Direction, + SQLCHAR * ServerName, + SQLSMALLINT BufferLength1, + SQLSMALLINT * NameLength1Ptr, + SQLCHAR * Description, + SQLSMALLINT BufferLength2, + SQLSMALLINT * NameLength2Ptr); #define N3SQLDataSources(a,b,c,d,e,f,g,h) (*(T3SQLDataSources)getOdbcFunction(ODBC3SQLDataSources))(a,b,c,d,e,f,g,h) - typedef SQLRETURN (SQL_API *T3SQLDrivers) ( SQLHENV EnvironmentHandle, - SQLUSMALLINT Direction, - SQLCHAR * DriverDescription, - SQLSMALLINT BufferLength1, - SQLSMALLINT * DescriptionLengthPtr, - SQLCHAR * DriverAttributes, - SQLSMALLINT BufferLength2, - SQLSMALLINT * AttributesLengthPtr); + typedef SQLRETURN (SQL_API *T3SQLDrivers) ( SQLHENV EnvironmentHandle, + SQLUSMALLINT Direction, + SQLCHAR * DriverDescription, + SQLSMALLINT BufferLength1, + SQLSMALLINT * DescriptionLengthPtr, + SQLCHAR * DriverAttributes, + SQLSMALLINT BufferLength2, + SQLSMALLINT * AttributesLengthPtr); #define N3SQLDrivers(a,b,c,d,e,f,g,h) (*(T3SQLDrivers)getOdbcFunction(ODBC3SQLDrivers))(a,b,c,d,e,f,g,h) - typedef SQLRETURN (SQL_API *T3SQLGetInfo) ( SQLHDBC ConnectionHandle, - SQLUSMALLINT InfoType, - SQLPOINTER InfoValuePtr, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLengthPtr); + typedef SQLRETURN (SQL_API *T3SQLGetInfo) ( SQLHDBC ConnectionHandle, + SQLUSMALLINT InfoType, + SQLPOINTER InfoValuePtr, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLengthPtr); #define N3SQLGetInfo(a,b,c,d,e) (*(T3SQLGetInfo)getOdbcFunction(ODBC3SQLGetInfo))(a,b,c,d,e) - typedef SQLRETURN (SQL_API *T3SQLGetFunctions) (SQLHDBC ConnectionHandle, - SQLUSMALLINT FunctionId, - SQLUSMALLINT * SupportedPtr); + typedef SQLRETURN (SQL_API *T3SQLGetFunctions) (SQLHDBC ConnectionHandle, + SQLUSMALLINT FunctionId, + SQLUSMALLINT * SupportedPtr); #define N3SQLGetFunctions(a,b,c) (*(T3SQLGetFunctions)getOdbcFunction(ODBC3SQLGetFunctions))(a,b,c) - typedef SQLRETURN (SQL_API *T3SQLGetTypeInfo) ( SQLHSTMT StatementHandle, - SQLSMALLINT DataType); + typedef SQLRETURN (SQL_API *T3SQLGetTypeInfo) ( SQLHSTMT StatementHandle, + SQLSMALLINT DataType); #define N3SQLGetTypeInfo(a,b) (*(T3SQLGetTypeInfo)getOdbcFunction(ODBC3SQLGetTypeInfo))(a,b) // Setting and retrieving driver attributes - typedef SQLRETURN (SQL_API *T3SQLSetConnectAttr)(SQLHDBC ConnectionHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER StringLength); + typedef SQLRETURN (SQL_API *T3SQLSetConnectAttr)(SQLHDBC ConnectionHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER StringLength); #define N3SQLSetConnectAttr(a,b,c,d) (*(T3SQLSetConnectAttr)getOdbcFunction(ODBC3SQLSetConnectAttr))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLGetConnectAttr) (SQLHDBC ConnectionHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength, - SQLINTEGER* StringLength); + typedef SQLRETURN (SQL_API *T3SQLGetConnectAttr) (SQLHDBC ConnectionHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength, + SQLINTEGER* StringLength); #define N3SQLGetConnectAttr(a,b,c,d,e) (*(T3SQLGetConnectAttr)getOdbcFunction(ODBC3SQLGetConnectAttr))(a,b,c,d,e) - typedef SQLRETURN (SQL_API *T3SQLSetEnvAttr) ( SQLHENV EnvironmentHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER StringLength); + typedef SQLRETURN (SQL_API *T3SQLSetEnvAttr) ( SQLHENV EnvironmentHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER StringLength); #define N3SQLSetEnvAttr(a,b,c,d) (*(T3SQLSetEnvAttr)getOdbcFunction(ODBC3SQLSetEnvAttr))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLGetEnvAttr) ( SQLHENV EnvironmentHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength, - SQLINTEGER* StringLength); + typedef SQLRETURN (SQL_API *T3SQLGetEnvAttr) ( SQLHENV EnvironmentHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength, + SQLINTEGER* StringLength); #define N3SQLGetEnvAttr(a,b,c,d,e) (*(T3SQLGetEnvAttr)getOdbcFunction(ODBC3SQLGetEnvAttr))(a,b,c,d,e) - typedef SQLRETURN (SQL_API *T3SQLSetStmtAttr) ( SQLHSTMT StatementHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER StringLength); + typedef SQLRETURN (SQL_API *T3SQLSetStmtAttr) ( SQLHSTMT StatementHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER StringLength); #define N3SQLSetStmtAttr(a,b,c,d) (*(T3SQLSetStmtAttr)getOdbcFunction(ODBC3SQLSetStmtAttr))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLGetStmtAttr) ( SQLHSTMT StatementHandle, - SQLINTEGER Attribute, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength, - SQLINTEGER* StringLength); + typedef SQLRETURN (SQL_API *T3SQLGetStmtAttr) ( SQLHSTMT StatementHandle, + SQLINTEGER Attribute, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength, + SQLINTEGER* StringLength); #define N3SQLGetStmtAttr(a,b,c,d,e) (*(T3SQLGetStmtAttr)getOdbcFunction(ODBC3SQLGetStmtAttr))(a,b,c,d,e) // Setting and retrieving descriptor fields - /*typedef SQLRETURN (SQL_API *T3SQLSetDescField) (SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength); + /*typedef SQLRETURN (SQL_API *T3SQLSetDescField) (SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, + SQLSMALLINT FieldIdentifier, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength); #define N3SQLSetDescField(a,b,c,d,e) (*(T3SQLSetDescField)getOdbcFunction(ODBC3SQLSetDescField))(a,b,c,d,e) - typedef SQLRETURN (SQL_API *T3SQLGetDescField) ( SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, - SQLSMALLINT FieldIdentifier, - SQLPOINTER ValuePtr, - SQLINTEGER BufferLength, - SQLINTEGER * StringLengthPtr); + typedef SQLRETURN (SQL_API *T3SQLGetDescField) ( SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, + SQLSMALLINT FieldIdentifier, + SQLPOINTER ValuePtr, + SQLINTEGER BufferLength, + SQLINTEGER * StringLengthPtr); #define N3SQLGetDescField(a,b,c,d,e,f) (*(T3SQLGetDescField)getOdbcFunction(ODBC3SQLGetDescField))(a,b,c,d,e,f) - typedef SQLRETURN (SQL_API *T3SQLGetDescRec) ( SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, - SQLCHAR * Name, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLengthPtr, - SQLSMALLINT * TypePtr, - SQLSMALLINT * SubTypePtr, - SQLLEN * LengthPtr, - SQLSMALLINT * PrecisionPtr, - SQLSMALLINT * ScalePtr, - SQLSMALLINT * NullablePtr); + typedef SQLRETURN (SQL_API *T3SQLGetDescRec) ( SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, + SQLCHAR * Name, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLengthPtr, + SQLSMALLINT * TypePtr, + SQLSMALLINT * SubTypePtr, + SQLLEN * LengthPtr, + SQLSMALLINT * PrecisionPtr, + SQLSMALLINT * ScalePtr, + SQLSMALLINT * NullablePtr); #define N3SQLGetDescRec(a,b,c,d,e,f,g,h,i,j,k) (*(T3SQLGetDescRec)getOdbcFunction(ODBC3SQLGetDescRec))(a,b,c,d,e,f,g,h,i,j,k) - typedef SQLRETURN (SQL_API *T3SQLSetDescRec) ( SQLHDESC DescriptorHandle, - SQLSMALLINT RecNumber, - SQLSMALLINT Type, - SQLSMALLINT SubType, - SQLINTEGER Length, - SQLSMALLINT Precision, - SQLSMALLINT Scale, - SQLPOINTER DataPtr, - SQLLEN * StringLengthPtr, - SQLLEN * IndicatorPtr); + typedef SQLRETURN (SQL_API *T3SQLSetDescRec) ( SQLHDESC DescriptorHandle, + SQLSMALLINT RecNumber, + SQLSMALLINT Type, + SQLSMALLINT SubType, + SQLINTEGER Length, + SQLSMALLINT Precision, + SQLSMALLINT Scale, + SQLPOINTER DataPtr, + SQLLEN * StringLengthPtr, + SQLLEN * IndicatorPtr); #define N3SQLSetDescRec(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSetDescRec)getOdbcFunction(ODBC3SQLSetDescRec))(a,b,c,d,e,f,g,h,i,j) */ // Preparing SQL requests - typedef SQLRETURN (SQL_API *T3SQLPrepare) ( SQLHSTMT StatementHandle, - SQLCHAR * StatementText, - SQLINTEGER TextLength); + typedef SQLRETURN (SQL_API *T3SQLPrepare) ( SQLHSTMT StatementHandle, + SQLCHAR * StatementText, + SQLINTEGER TextLength); #define N3SQLPrepare(a,b,c) (*(T3SQLPrepare)getOdbcFunction(ODBC3SQLPrepare))(a,b,c) - typedef SQLRETURN (SQL_API *T3SQLBindParameter) (SQLHSTMT StatementHandle, - SQLUSMALLINT ParameterNumber, - SQLSMALLINT InputOutputType, - SQLSMALLINT ValueType, - SQLSMALLINT ParameterType, - SQLULEN ColumnSize, - SQLSMALLINT DecimalDigits, - SQLPOINTER ParameterValuePtr, - SQLLEN BufferLength, - SQLLEN * StrLen_or_IndPtr); + typedef SQLRETURN (SQL_API *T3SQLBindParameter) (SQLHSTMT StatementHandle, + SQLUSMALLINT ParameterNumber, + SQLSMALLINT InputOutputType, + SQLSMALLINT ValueType, + SQLSMALLINT ParameterType, + SQLULEN ColumnSize, + SQLSMALLINT DecimalDigits, + SQLPOINTER ParameterValuePtr, + SQLLEN BufferLength, + SQLLEN * StrLen_or_IndPtr); #define N3SQLBindParameter(a,b,c,d,e,f,g,h,i,j) (*(T3SQLBindParameter)getOdbcFunction(ODBC3SQLBindParameter))(a,b,c,d,e,f,g,h,i,j) - /*typedef SQLRETURN (SQL_API *T3SQLGetCursorName) (SQLHSTMT StatementHandle, - SQLCHAR * CursorName, - SQLSMALLINT BufferLength, - SQLSMALLINT * NameLengthPtr); + /*typedef SQLRETURN (SQL_API *T3SQLGetCursorName) (SQLHSTMT StatementHandle, + SQLCHAR * CursorName, + SQLSMALLINT BufferLength, + SQLSMALLINT * NameLengthPtr); #define N3SQLGetCursorName(a,b,c,d) (*(T3SQLGetCursorName)getOdbcFunction(ODBC3SQLGetCursorName))(a,b,c,d) */ - typedef SQLRETURN (SQL_API *T3SQLSetCursorName) (SQLHSTMT StatementHandle, - SQLCHAR * CursorName, - SQLSMALLINT NameLength); + typedef SQLRETURN (SQL_API *T3SQLSetCursorName) (SQLHSTMT StatementHandle, + SQLCHAR * CursorName, + SQLSMALLINT NameLength); #define N3SQLSetCursorName(a,b,c) (*(T3SQLSetCursorName)getOdbcFunction(ODBC3SQLSetCursorName))(a,b,c) // Submitting requests - typedef SQLRETURN (SQL_API *T3SQLExecute) ( SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLExecute) ( SQLHSTMT StatementHandle); #define N3SQLExecute(a) (*(T3SQLExecute)getOdbcFunction(ODBC3SQLExecute))(a) - typedef SQLRETURN (SQL_API *T3SQLExecDirect) ( SQLHSTMT StatementHandle, - SQLCHAR * StatementText, - SQLINTEGER TextLength); + typedef SQLRETURN (SQL_API *T3SQLExecDirect) ( SQLHSTMT StatementHandle, + SQLCHAR * StatementText, + SQLINTEGER TextLength); #define N3SQLExecDirect(a,b,c) (*(T3SQLExecDirect)getOdbcFunction(ODBC3SQLExecDirect))(a,b,c) - /*typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHDBC ConnectionHandle, - SQLCHAR * InStatementText, - SQLINTEGER TextLength1, - SQLCHAR * utStatementText, - SQLINTEGER BufferLength, - SQLINTEGER * TextLength2Ptr); + /*typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHDBC ConnectionHandle, + SQLCHAR * InStatementText, + SQLINTEGER TextLength1, + SQLCHAR * utStatementText, + SQLINTEGER BufferLength, + SQLINTEGER * TextLength2Ptr); #define N3SQLNativeSql(a,b,c,d,e,f) (*(T3SQLNativeSql)getOdbcFunction(ODBC3SQLNativeSql))(a,b,c,d,e,f)*/ - typedef SQLRETURN (SQL_API *T3SQLDescribeParam) (SQLHSTMT StatementHandle, - SQLUSMALLINT ParameterNumber, - SQLSMALLINT * DataTypePtr, - SQLULEN * ParameterSizePtr, - SQLSMALLINT * DecimalDigitsPtr, - SQLSMALLINT * NullablePtr); + typedef SQLRETURN (SQL_API *T3SQLDescribeParam) (SQLHSTMT StatementHandle, + SQLUSMALLINT ParameterNumber, + SQLSMALLINT * DataTypePtr, + SQLULEN * ParameterSizePtr, + SQLSMALLINT * DecimalDigitsPtr, + SQLSMALLINT * NullablePtr); #define N3SQLDescribeParam(a,b,c,d,e,f) (*(T3SQLDescribeParam)getOdbcFunction(ODBC3SQLDescribeParam))(a,b,c,d,e,f) - typedef SQLRETURN (SQL_API *T3SQLNumParams) ( SQLHSTMT StatementHandle, - SQLSMALLINT * ParameterCountPtr); + typedef SQLRETURN (SQL_API *T3SQLNumParams) ( SQLHSTMT StatementHandle, + SQLSMALLINT * ParameterCountPtr); #define N3SQLNumParams(a,b) (*(T3SQLNumParams)getOdbcFunction(ODBC3SQLNumParams))(a,b) - typedef SQLRETURN (SQL_API *T3SQLParamData) ( SQLHSTMT StatementHandle, - SQLPOINTER * ValuePtrPtr); + typedef SQLRETURN (SQL_API *T3SQLParamData) ( SQLHSTMT StatementHandle, + SQLPOINTER * ValuePtrPtr); #define N3SQLParamData(a,b) (*(T3SQLParamData)getOdbcFunction(ODBC3SQLParamData))(a,b) - typedef SQLRETURN (SQL_API *T3SQLPutData) ( SQLHSTMT StatementHandle, - SQLPOINTER DataPtr, - SQLLEN StrLen_or_Ind); + typedef SQLRETURN (SQL_API *T3SQLPutData) ( SQLHSTMT StatementHandle, + SQLPOINTER DataPtr, + SQLLEN StrLen_or_Ind); #define N3SQLPutData(a,b,c) (*(T3SQLPutData)getOdbcFunction(ODBC3SQLPutData))(a,b,c) // Retrieving results and information about results - typedef SQLRETURN (SQL_API *T3SQLRowCount) ( SQLHSTMT StatementHandle, - SQLLEN * RowCountPtr); + typedef SQLRETURN (SQL_API *T3SQLRowCount) ( SQLHSTMT StatementHandle, + SQLLEN * RowCountPtr); #define N3SQLRowCount(a,b) (*(T3SQLRowCount)getOdbcFunction(ODBC3SQLRowCount))(a,b) - typedef SQLRETURN (SQL_API *T3SQLNumResultCols) (SQLHSTMT StatementHandle, - SQLSMALLINT * ColumnCountPtr); + typedef SQLRETURN (SQL_API *T3SQLNumResultCols) (SQLHSTMT StatementHandle, + SQLSMALLINT * ColumnCountPtr); #define N3SQLNumResultCols(a,b) (*(T3SQLNumResultCols)getOdbcFunction(ODBC3SQLNumResultCols))(a,b) - typedef SQLRETURN (SQL_API *T3SQLDescribeCol) ( SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, - SQLCHAR * ColumnName, - SQLSMALLINT BufferLength, - SQLSMALLINT * NameLengthPtr, - SQLSMALLINT * DataTypePtr, - SQLULEN * ColumnSizePtr, - SQLSMALLINT * DecimalDigitsPtr, - SQLSMALLINT * NullablePtr); + typedef SQLRETURN (SQL_API *T3SQLDescribeCol) ( SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, + SQLCHAR * ColumnName, + SQLSMALLINT BufferLength, + SQLSMALLINT * NameLengthPtr, + SQLSMALLINT * DataTypePtr, + SQLULEN * ColumnSizePtr, + SQLSMALLINT * DecimalDigitsPtr, + SQLSMALLINT * NullablePtr); #define N3SQLDescribeCol(a,b,c,d,e,f,g,h,i) (*(T3SQLDescribeCol)getOdbcFunction(ODBC3SQLDescribeCol))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLColAttribute) (SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, - SQLUSMALLINT FieldIdentifier, - SQLPOINTER CharacterAttributePtr, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLengthPtr, - SQLLEN * NumericAttributePtr); + typedef SQLRETURN (SQL_API *T3SQLColAttribute) (SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, + SQLUSMALLINT FieldIdentifier, + SQLPOINTER CharacterAttributePtr, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLengthPtr, + SQLLEN * NumericAttributePtr); #define N3SQLColAttribute(a,b,c,d,e,f,g) (*(T3SQLColAttribute)getOdbcFunction(ODBC3SQLColAttribute))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLBindCol) ( SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, - SQLSMALLINT TargetType, - SQLPOINTER TargetValuePtr, - SQLLEN BufferLength, - SQLLEN * StrLen_or_IndPtr); + typedef SQLRETURN (SQL_API *T3SQLBindCol) ( SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, + SQLSMALLINT TargetType, + SQLPOINTER TargetValuePtr, + SQLLEN BufferLength, + SQLLEN * StrLen_or_IndPtr); #define N3SQLBindCol(a,b,c,d,e,f) (*(T3SQLBindCol)getOdbcFunction(ODBC3SQLBindCol))(a,b,c,d,e,f) - typedef SQLRETURN (SQL_API *T3SQLFetch) ( SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLFetch) ( SQLHSTMT StatementHandle); #define N3SQLFetch(a) (*(T3SQLFetch)getOdbcFunction(ODBC3SQLFetch))(a) - typedef SQLRETURN (SQL_API *T3SQLFetchScroll) ( SQLHSTMT StatementHandle, - SQLSMALLINT FetchOrientation, - SQLLEN FetchOffset); + typedef SQLRETURN (SQL_API *T3SQLFetchScroll) ( SQLHSTMT StatementHandle, + SQLSMALLINT FetchOrientation, + SQLLEN FetchOffset); #define N3SQLFetchScroll(a,b,c) (*(T3SQLFetchScroll)getOdbcFunction(ODBC3SQLFetchScroll))(a,b,c) - typedef SQLRETURN (SQL_API *T3SQLGetData) ( SQLHSTMT StatementHandle, - SQLUSMALLINT ColumnNumber, - SQLSMALLINT TargetType, - SQLPOINTER TargetValuePtr, - SQLLEN BufferLength, - SQLLEN * StrLen_or_IndPtr); + typedef SQLRETURN (SQL_API *T3SQLGetData) ( SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, + SQLSMALLINT TargetType, + SQLPOINTER TargetValuePtr, + SQLLEN BufferLength, + SQLLEN * StrLen_or_IndPtr); #define N3SQLGetData(a,b,c,d,e,f) (*(T3SQLGetData)getOdbcFunction(ODBC3SQLGetData))(a,b,c,d,e,f) - typedef SQLRETURN (SQL_API *T3SQLSetPos) ( SQLHSTMT StatementHandle, - SQLSETPOSIROW RowNumber, - SQLUSMALLINT Operation, - SQLUSMALLINT LockType); + typedef SQLRETURN (SQL_API *T3SQLSetPos) ( SQLHSTMT StatementHandle, + SQLSETPOSIROW RowNumber, + SQLUSMALLINT Operation, + SQLUSMALLINT LockType); #define N3SQLSetPos(a,b,c,d) (*(T3SQLSetPos)getOdbcFunction(ODBC3SQLSetPos))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLBulkOperations) ( SQLHSTMT StatementHandle, - SQLSMALLINT Operation); + typedef SQLRETURN (SQL_API *T3SQLBulkOperations) ( SQLHSTMT StatementHandle, + SQLSMALLINT Operation); #define N3SQLBulkOperations(a,b) (*(T3SQLBulkOperations)getOdbcFunction(ODBC3SQLBulkOperations))(a,b) - typedef SQLRETURN (SQL_API *T3SQLMoreResults) ( SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLMoreResults) ( SQLHSTMT StatementHandle); #define N3SQLMoreResults(a) (*(T3SQLMoreResults)getOdbcFunction(ODBC3SQLMoreResults))(a) - /*typedef SQLRETURN (SQL_API *T3SQLGetDiagField) (SQLSMALLINT HandleType, - SQLHANDLE Handle, - SQLSMALLINT RecNumber, - SQLSMALLINT DiagIdentifier, - SQLPOINTER DiagInfoPtr, - SQLSMALLINT BufferLength, - SQLSMALLINT * StringLengthPtr); + /*typedef SQLRETURN (SQL_API *T3SQLGetDiagField) (SQLSMALLINT HandleType, + SQLHANDLE Handle, + SQLSMALLINT RecNumber, + SQLSMALLINT DiagIdentifier, + SQLPOINTER DiagInfoPtr, + SQLSMALLINT BufferLength, + SQLSMALLINT * StringLengthPtr); #define N3SQLGetDiagField(a,b,c,d,e,f,g) (*(T3SQLGetDiagField)getOdbcFunction(ODBC3SQLGetDiagField))(a,b,c,d,e,f,g)*/ - typedef SQLRETURN (SQL_API *T3SQLGetDiagRec) ( SQLSMALLINT HandleType, - SQLHANDLE Handle, - SQLSMALLINT RecNumber, - SQLCHAR * Sqlstate, - SQLINTEGER * NativeErrorPtr, - SQLCHAR * MessageText, - SQLSMALLINT BufferLength, - SQLSMALLINT * TextLengthPtr); + typedef SQLRETURN (SQL_API *T3SQLGetDiagRec) ( SQLSMALLINT HandleType, + SQLHANDLE Handle, + SQLSMALLINT RecNumber, + SQLCHAR * Sqlstate, + SQLINTEGER * NativeErrorPtr, + SQLCHAR * MessageText, + SQLSMALLINT BufferLength, + SQLSMALLINT * TextLengthPtr); #define N3SQLGetDiagRec(a,b,c,d,e,f,g,h) (*(T3SQLGetDiagRec)getOdbcFunction(ODBC3SQLGetDiagRec))(a,b,c,d,e,f,g,h) // Obtaining information about the data source's system tables (catalog functions) - typedef SQLRETURN (SQL_API *T3SQLColumnPrivileges) (SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLCHAR * ColumnName, - SQLSMALLINT NameLength4); + typedef SQLRETURN (SQL_API *T3SQLColumnPrivileges) (SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLCHAR * ColumnName, + SQLSMALLINT NameLength4); #define N3SQLColumnPrivileges(a,b,c,d,e,f,g,h,i) (*(T3SQLColumnPrivileges)getOdbcFunction(ODBC3SQLColumnPrivileges))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLColumns) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLCHAR * ColumnName, - SQLSMALLINT NameLength4); + typedef SQLRETURN (SQL_API *T3SQLColumns) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLCHAR * ColumnName, + SQLSMALLINT NameLength4); #define N3SQLColumns(a,b,c,d,e,f,g,h,i) (*(T3SQLColumns)getOdbcFunction(ODBC3SQLColumns))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLForeignKeys) ( SQLHSTMT StatementHandle, - SQLCHAR * PKCatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * PKSchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * PKTableName, - SQLSMALLINT NameLength3, - SQLCHAR * FKCatalogName, - SQLSMALLINT NameLength4, - SQLCHAR * FKSchemaName, - SQLSMALLINT NameLength5, - SQLCHAR * FKTableName, - SQLSMALLINT NameLength6); + typedef SQLRETURN (SQL_API *T3SQLForeignKeys) ( SQLHSTMT StatementHandle, + SQLCHAR * PKCatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * PKSchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * PKTableName, + SQLSMALLINT NameLength3, + SQLCHAR * FKCatalogName, + SQLSMALLINT NameLength4, + SQLCHAR * FKSchemaName, + SQLSMALLINT NameLength5, + SQLCHAR * FKTableName, + SQLSMALLINT NameLength6); #define N3SQLForeignKeys(a,b,c,d,e,f,g,h,i,j,k,l,m) (*(T3SQLForeignKeys)getOdbcFunction(ODBC3SQLForeignKeys))(a,b,c,d,e,f,g,h,i,j,k,l,m) - typedef SQLRETURN (SQL_API *T3SQLPrimaryKeys) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3); + typedef SQLRETURN (SQL_API *T3SQLPrimaryKeys) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3); #define N3SQLPrimaryKeys(a,b,c,d,e,f,g) (*(T3SQLPrimaryKeys)getOdbcFunction(ODBC3SQLPrimaryKeys))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLProcedureColumns) (SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * ProcName, - SQLSMALLINT NameLength3, - SQLCHAR * ColumnName, - SQLSMALLINT NameLength4); + typedef SQLRETURN (SQL_API *T3SQLProcedureColumns) (SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * ProcName, + SQLSMALLINT NameLength3, + SQLCHAR * ColumnName, + SQLSMALLINT NameLength4); #define N3SQLProcedureColumns(a,b,c,d,e,f,g,h,i) (*(T3SQLProcedureColumns)getOdbcFunction(ODBC3SQLProcedureColumns))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLProcedures) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * ProcName, - SQLSMALLINT NameLength3); + typedef SQLRETURN (SQL_API *T3SQLProcedures) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * ProcName, + SQLSMALLINT NameLength3); #define N3SQLProcedures(a,b,c,d,e,f,g) (*(T3SQLProcedures)getOdbcFunction(ODBC3SQLProcedures))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLSpecialColumns) (SQLHSTMT StatementHandle, - SQLUSMALLINT IdentifierType, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLUSMALLINT Scope, - SQLUSMALLINT Nullable); + typedef SQLRETURN (SQL_API *T3SQLSpecialColumns) (SQLHSTMT StatementHandle, + SQLUSMALLINT IdentifierType, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLUSMALLINT Scope, + SQLUSMALLINT Nullable); #define N3SQLSpecialColumns(a,b,c,d,e,f,g,h,i,j) (*(T3SQLSpecialColumns)getOdbcFunction(ODBC3SQLSpecialColumns))(a,b,c,d,e,f,g,h,i,j) - typedef SQLRETURN (SQL_API *T3SQLStatistics) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLUSMALLINT Unique, - SQLUSMALLINT Reserved); + typedef SQLRETURN (SQL_API *T3SQLStatistics) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLUSMALLINT Unique, + SQLUSMALLINT Reserved); #define N3SQLStatistics(a,b,c,d,e,f,g,h,i) (*(T3SQLStatistics)getOdbcFunction(ODBC3SQLStatistics))(a,b,c,d,e,f,g,h,i) - typedef SQLRETURN (SQL_API *T3SQLTablePrivileges) (SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3); + typedef SQLRETURN (SQL_API *T3SQLTablePrivileges) (SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3); #define N3SQLTablePrivileges(a,b,c,d,e,f,g) (*(T3SQLTablePrivileges)getOdbcFunction(ODBC3SQLTablePrivileges))(a,b,c,d,e,f,g) - typedef SQLRETURN (SQL_API *T3SQLTables) ( SQLHSTMT StatementHandle, - SQLCHAR * CatalogName, - SQLSMALLINT NameLength1, - SQLCHAR * SchemaName, - SQLSMALLINT NameLength2, - SQLCHAR * TableName, - SQLSMALLINT NameLength3, - SQLCHAR * TableType, - SQLSMALLINT NameLength4); + typedef SQLRETURN (SQL_API *T3SQLTables) ( SQLHSTMT StatementHandle, + SQLCHAR * CatalogName, + SQLSMALLINT NameLength1, + SQLCHAR * SchemaName, + SQLSMALLINT NameLength2, + SQLCHAR * TableName, + SQLSMALLINT NameLength3, + SQLCHAR * TableType, + SQLSMALLINT NameLength4); #define N3SQLTables(a,b,c,d,e,f,g,h,i) (*(T3SQLTables)getOdbcFunction(ODBC3SQLTables))(a,b,c,d,e,f,g,h,i) // Terminating a statement - typedef SQLRETURN (SQL_API *T3SQLFreeStmt) ( SQLHSTMT StatementHandle, - SQLUSMALLINT Option); + typedef SQLRETURN (SQL_API *T3SQLFreeStmt) ( SQLHSTMT StatementHandle, + SQLUSMALLINT Option); #define N3SQLFreeStmt(a,b) (*(T3SQLFreeStmt)getOdbcFunction(ODBC3SQLFreeStmt))(a,b) - typedef SQLRETURN (SQL_API *T3SQLCloseCursor) (SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLCloseCursor) (SQLHSTMT StatementHandle); #define N3SQLCloseCursor(a) (*(T3SQLCloseCursor)getOdbcFunction(ODBC3SQLCloseCursor))(a) - typedef SQLRETURN (SQL_API *T3SQLCancel) ( SQLHSTMT StatementHandle); + typedef SQLRETURN (SQL_API *T3SQLCancel) ( SQLHSTMT StatementHandle); #define N3SQLCancel(a) (*(T3SQLCancel)getOdbcFunction(ODBC3SQLCancel))(a) - typedef SQLRETURN (SQL_API *T3SQLEndTran) ( SQLSMALLINT HandleType, - SQLHANDLE Handle, - SQLSMALLINT CompletionType); + typedef SQLRETURN (SQL_API *T3SQLEndTran) ( SQLSMALLINT HandleType, + SQLHANDLE Handle, + SQLSMALLINT CompletionType); #define N3SQLEndTran(a,b,c) (*(T3SQLEndTran)getOdbcFunction(ODBC3SQLEndTran))(a,b,c) // Terminating a connection - typedef SQLRETURN (SQL_API *T3SQLDisconnect) (SQLHDBC ConnectionHandle); + typedef SQLRETURN (SQL_API *T3SQLDisconnect) (SQLHDBC ConnectionHandle); #define N3SQLDisconnect(a) (*(T3SQLDisconnect)getOdbcFunction(ODBC3SQLDisconnect))(a) - typedef SQLRETURN (SQL_API *T3SQLFreeHandle) (SQLSMALLINT HandleType, - SQLHANDLE Handle); + typedef SQLRETURN (SQL_API *T3SQLFreeHandle) (SQLSMALLINT HandleType, + SQLHANDLE Handle); #define N3SQLFreeHandle(a,b) (*(T3SQLFreeHandle)getOdbcFunction(ODBC3SQLFreeHandle))(a,b) - typedef SQLRETURN (SQL_API *T3SQLGetCursorName) ( SQLHSTMT StatementHandle, - SQLCHAR * CursorName, - SQLSMALLINT BufferLength, - SQLSMALLINT* NameLength2); + typedef SQLRETURN (SQL_API *T3SQLGetCursorName) ( SQLHSTMT StatementHandle, + SQLCHAR * CursorName, + SQLSMALLINT BufferLength, + SQLSMALLINT* NameLength2); #define N3SQLGetCursorName(a,b,c,d) (*(T3SQLGetCursorName)getOdbcFunction(ODBC3SQLGetCursorName))(a,b,c,d) - typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHSTMT ConnectionHandle, - SQLCHAR * InStatementText, - SQLINTEGER TextLength1, - SQLCHAR * OutStatementText, - SQLINTEGER BufferLength, - SQLINTEGER * TextLength2Ptr); + typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHSTMT ConnectionHandle, + SQLCHAR * InStatementText, + SQLINTEGER TextLength1, + SQLCHAR * OutStatementText, + SQLINTEGER BufferLength, + SQLINTEGER * TextLength2Ptr); #define N3SQLNativeSql(a,b,c,d,e,f) (*(T3SQLNativeSql)getOdbcFunction(ODBC3SQLNativeSql))(a,b,c,d,e,f) } diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index 8c413555b17a..1e8362834b55 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.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,54 +44,54 @@ namespace connectivity { class OBoundParam; - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, ::com::sun::star::sdbc::XParameters, ::com::sun::star::sdbc::XPreparedBatchExecution, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE; class OOO_DLLPUBLIC_ODBCBASE OPreparedStatement : - public OStatement_BASE2, + public OStatement_BASE2, public OPreparedStatement_BASE { protected: struct Parameter { - ::com::sun::star::uno::Any aValue; - sal_Int32 nDataType; + ::com::sun::star::uno::Any aValue; + sal_Int32 nDataType; - Parameter(const ::com::sun::star::uno::Any& rValue, - sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) + Parameter(const ::com::sun::star::uno::Any& rValue, + sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) { } }; - ::std::vector< Parameter> m_aParameters; + ::std::vector< Parameter> m_aParameters; //==================================================================== // Data attributes //==================================================================== - SQLSMALLINT numParams; // Number of parameter markers + SQLSMALLINT numParams; // Number of parameter markers // for the prepared statement - OBoundParam* boundParams; + OBoundParam* boundParams; // Array of bound parameter // objects. Each parameter // marker will have a // corresponding object to // hold bind information, and // resulting data. - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; - sal_Bool m_bPrepared; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + sal_Bool m_bPrepared; void FreeParams(); void putParamData (sal_Int32 index) throw(::com::sun::star::sdbc::SQLException); void setStream (sal_Int32 ParameterIndex,const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, SQLLEN length,sal_Int32 SQLtype) throw(::com::sun::star::sdbc::SQLException); - sal_Int32 getParamLength ( sal_Int32 index); + sal_Int32 getParamLength ( sal_Int32 index); sal_Int8* getLengthBuf (sal_Int32 index); sal_Int8* getDataBuf (sal_Int32 index); - sal_Int8* allocBindBuf ( sal_Int32 index, sal_Int32 bufLen); + sal_Int8* allocBindBuf ( sal_Int32 index, sal_Int32 bufLen); void initBoundParam () throw(::com::sun::star::sdbc::SQLException); void setParameter(sal_Int32 parameterIndex,sal_Int32 _nType,sal_Int32 _nSize,void* _pData); diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index bbb39209496e..7a9b39969427 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.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,7 +55,7 @@ namespace connectivity { /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -74,7 +74,7 @@ namespace connectivity typedef ::std::pair<sal_Int64,sal_Int32> TVoidPtr; typedef ::std::allocator< TVoidPtr > TVoidAlloc; typedef ::std::vector<TVoidPtr> TVoidVector; - // typedef ::com::sun::star::uno::Sequence<TVoidPtr> TVoidVector; + // typedef ::com::sun::star::uno::Sequence<TVoidPtr> TVoidVector; /// unary_function Functor object for class ZZ returntype is void struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : ::std::binary_function< ::com::sun::star::uno::Sequence<sal_Int8>, ::com::sun::star::uno::Sequence<sal_Int8>, bool > { @@ -86,8 +86,8 @@ namespace connectivity sal_Int32 nCount = _rLH.getLength(); if(nCount != 4) { - const sal_Int8* pLHBack = _rLH.getConstArray() + nCount - 1; - const sal_Int8* pRHBack = _rRH.getConstArray() + nCount - 1; + const sal_Int8* pLHBack = _rLH.getConstArray() + nCount - 1; + const sal_Int8* pRHBack = _rRH.getConstArray() + nCount - 1; sal_Int32 i; for(i=0;i < nCount;++i,--pLHBack,--pRHBack) @@ -114,52 +114,52 @@ namespace connectivity typedef ::std::map< ::com::sun::star::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap; class OOO_DLLPUBLIC_ODBCBASE OResultSet : - public comphelper::OBaseMutex, - public ::connectivity::IResultSetHelper, - public OResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + public comphelper::OBaseMutex, + public ::connectivity::IResultSetHelper, + public OResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { protected: - TBookmarkPosMap m_aPosToBookmarks; + TBookmarkPosMap m_aPosToBookmarks; // used top hold the information about the value and the datatype to save calls to metadata - typedef ::std::vector<ORowSetValue> TDataRow; + typedef ::std::vector<ORowSetValue> TDataRow; - TVoidVector m_aBindVector; - ::std::vector<SQLLEN> m_aLengthVector; - ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; - ::com::sun::star::uno::Sequence<sal_Int8> m_aBookmark; + TVoidVector m_aBindVector; + ::std::vector<SQLLEN> m_aLengthVector; + ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; + ::com::sun::star::uno::Sequence<sal_Int8> m_aBookmark; - TDataRow m_aRow; // only used when SQLGetData can't be called in any order - ORowSetValue m_aEmptyValue; // needed for the getValue method when no prefetch is used - SQLHANDLE m_aStatementHandle; - SQLHANDLE m_aConnectionHandle; - OStatement_Base* m_pStatement; - OSkipDeletedSet* m_pSkipDeletedSet; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; + TDataRow m_aRow; // only used when SQLGetData can't be called in any order + ORowSetValue m_aEmptyValue; // needed for the getValue method when no prefetch is used + SQLHANDLE m_aStatementHandle; + SQLHANDLE m_aConnectionHandle; + OStatement_Base* m_pStatement; + OSkipDeletedSet* m_pSkipDeletedSet; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - SQLUSMALLINT* m_pRowStatusArray; - rtl_TextEncoding m_nTextEncoding; - sal_Int32 m_nRowPos; - sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are + SQLUSMALLINT* m_pRowStatusArray; + rtl_TextEncoding m_nTextEncoding; + sal_Int32 m_nRowPos; + sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are mutable sal_uInt32 m_nUseBookmarks; - SQLRETURN m_nCurrentFetchState; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; // after last record - sal_Bool m_bLastRecord; - sal_Bool m_bFreeHandle; - sal_Bool m_bInserting; - sal_Bool m_bFetchData; // true when SQLGetaData can be called in any order or when fetching data for m_aRow - sal_Bool m_bRowInserted; - sal_Bool m_bRowDeleted; - sal_Bool m_bUseFetchScroll; + SQLRETURN m_nCurrentFetchState; + sal_Bool m_bWasNull; + sal_Bool m_bEOF; // after last record + sal_Bool m_bLastRecord; + sal_Bool m_bFreeHandle; + sal_Bool m_bInserting; + sal_Bool m_bFetchData; // true when SQLGetaData can be called in any order or when fetching data for m_aRow + sal_Bool m_bRowInserted; + sal_Bool m_bRowDeleted; + sal_Bool m_bUseFetchScroll; - sal_Bool isBookmarkable() const; + sal_Bool isBookmarkable() const; sal_Int32 getResultSetConcurrency() const; - sal_Int32 getResultSetType() const; - sal_Int32 getFetchDirection() const; - sal_Int32 getFetchSize() const; - ::rtl::OUString getCursorName() const; + sal_Int32 getResultSetType() const; + sal_Int32 getFetchDirection() const; + sal_Int32 getFetchSize() const; + ::rtl::OUString getCursorName() const; void setFetchDirection(sal_Int32 _par0); void setFetchSize(sal_Int32 _par0); @@ -175,7 +175,7 @@ namespace connectivity TVoidPtr allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex); SQLRETURN unbind(sal_Bool _bUnbindHandle = sal_True); SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex); - + // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index 213db25288dc..86e2441d38cd 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.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,28 +48,28 @@ namespace connectivity typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; class OOO_DLLPUBLIC_ODBCBASE OResultSetMetaData : - public OResultSetMetaData_BASE + public OResultSetMetaData_BASE { protected: ::std::vector<sal_Int32> m_vMapping; // when not every column is needed ::std::map<sal_Int32,sal_Int32> m_aColumnTypes; - SQLHANDLE m_aStatementHandle; - OConnection* m_pConnection; - sal_Int32 m_nColCount; - sal_Bool m_bUseODBC2Types; + SQLHANDLE m_aStatementHandle; + OConnection* m_pConnection; + sal_Int32 m_nColCount; + sal_Bool m_bUseODBC2Types; ::rtl::OUString getCharColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getNumColAttrib(sal_Int32 column,sal_Int32 ident) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ) + OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ) :m_aStatementHandle( _pStmt ) ,m_pConnection(_pConnection) ,m_nColCount(-1) ,m_bUseODBC2Types(sal_False) {} - OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping) + OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping) :m_vMapping(_vMapping) ,m_aStatementHandle( _pStmt ) ,m_pConnection(_pConnection) diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 3532156e7d94..97a1254e1806 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.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 @@ -53,7 +53,7 @@ namespace connectivity namespace odbc { - typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable, @@ -66,23 +66,23 @@ namespace connectivity //************************************************************** class OOO_DLLPUBLIC_ODBCBASE OStatement_Base : public comphelper::OBaseMutex, - public OStatement_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> + public OStatement_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> { ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> m_xGeneratedStatement; // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; - ::rtl::OUString m_sSqlStatement; + ::std::list< ::rtl::OUString> m_aBatchList; + ::rtl::OUString m_sSqlStatement; - OConnection* m_pConnection;// The owning Connection object - SQLHANDLE m_aStatementHandle; - SQLUSMALLINT* m_pRowStatusArray; + OConnection* m_pConnection;// The owning Connection object + SQLHANDLE m_aStatementHandle; + SQLUSMALLINT* m_pRowStatusArray; ::cppu::OBroadcastHelper& rBHelper; protected: @@ -90,26 +90,26 @@ namespace connectivity sal_Int32 getQueryTimeOut() const; sal_Int32 getMaxFieldSize() const; sal_Int32 getMaxRows() const; - sal_Int32 getResultSetConcurrency() const; + sal_Int32 getResultSetConcurrency() const; sal_Int32 getResultSetType() const; sal_Int32 getFetchDirection() const; sal_Int32 getFetchSize() const; ::rtl::OUString getCursorName() const; - sal_Bool isUsingBookmarks() const; + sal_Bool isUsingBookmarks() const; sal_Bool getEscapeProcessing() const; sal_Int32 getStmtOption (short fOption) const; - void setQueryTimeOut(sal_Int32 _par0) ; - void setMaxFieldSize(sal_Int32 _par0) ; - void setMaxRows(sal_Int32 _par0) ; - void setFetchDirection(sal_Int32 _par0) ; - void setFetchSize(sal_Int32 _par0) ; + void setQueryTimeOut(sal_Int32 _par0) ; + void setMaxFieldSize(sal_Int32 _par0) ; + void setMaxRows(sal_Int32 _par0) ; + void setFetchDirection(sal_Int32 _par0) ; + void setFetchSize(sal_Int32 _par0) ; void setCursorName(const ::rtl::OUString &_par0); void setEscapeProcessing( const sal_Bool _bEscapeProc ); - virtual void setResultSetConcurrency(sal_Int32 _par0) ; - virtual void setResultSetType(sal_Int32 _par0) ; - virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; + virtual void setResultSetConcurrency(sal_Int32 _par0) ; + virtual void setResultSetType(sal_Int32 _par0) ; + virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; void reset () throw( ::com::sun::star::sdbc::SQLException); void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException); @@ -197,8 +197,8 @@ namespace connectivity SQLHANDLE getConnectionHandle() { return m_pConnection->getConnection(); } OConnection* getOwnConnection() const { return m_pConnection;} /** getCursorProperties return the properties for a specific cursor type - @param _nCursorType the CursorType - @param bFirst when true the first property set is returned + @param _nCursorType the CursorType + @param bFirst when true the first property set is returned @return the cursor properties */ diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index 7f48373e22f4..e493cec4544f 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.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,60 +39,60 @@ #include <com/sun/star/uno/Sequence.hxx> #include <rtl/textenc.h> -#define ODBC3SQLAllocHandle 1 -#define ODBC3SQLConnect 2 -#define ODBC3SQLDriverConnect 3 -#define ODBC3SQLBrowseConnect 4 -#define ODBC3SQLDataSources 5 -#define ODBC3SQLDrivers 6 -#define ODBC3SQLGetInfo 7 -#define ODBC3SQLGetFunctions 8 -#define ODBC3SQLGetTypeInfo 9 -#define ODBC3SQLSetConnectAttr 10 -#define ODBC3SQLGetConnectAttr 11 -#define ODBC3SQLSetEnvAttr 12 -#define ODBC3SQLGetEnvAttr 13 -#define ODBC3SQLSetStmtAttr 14 -#define ODBC3SQLGetStmtAttr 15 -#define ODBC3SQLPrepare 16 -#define ODBC3SQLBindParameter 17 -#define ODBC3SQLSetCursorName 18 -#define ODBC3SQLExecute 19 -#define ODBC3SQLExecDirect 20 -#define ODBC3SQLDescribeParam 21 -#define ODBC3SQLNumParams 22 -#define ODBC3SQLParamData 23 -#define ODBC3SQLPutData 24 -#define ODBC3SQLRowCount 25 -#define ODBC3SQLNumResultCols 26 -#define ODBC3SQLDescribeCol 27 -#define ODBC3SQLColAttribute 28 -#define ODBC3SQLBindCol 29 -#define ODBC3SQLFetch 30 -#define ODBC3SQLFetchScroll 31 -#define ODBC3SQLGetData 32 -#define ODBC3SQLSetPos 33 -#define ODBC3SQLBulkOperations 34 -#define ODBC3SQLMoreResults 35 -#define ODBC3SQLGetDiagRec 36 -#define ODBC3SQLColumnPrivileges 37 -#define ODBC3SQLColumns 38 -#define ODBC3SQLForeignKeys 39 -#define ODBC3SQLPrimaryKeys 40 -#define ODBC3SQLProcedureColumns 41 -#define ODBC3SQLProcedures 42 -#define ODBC3SQLSpecialColumns 43 -#define ODBC3SQLStatistics 44 -#define ODBC3SQLTablePrivileges 45 -#define ODBC3SQLTables 46 -#define ODBC3SQLFreeStmt 47 -#define ODBC3SQLCloseCursor 48 -#define ODBC3SQLCancel 49 -#define ODBC3SQLEndTran 50 -#define ODBC3SQLDisconnect 51 -#define ODBC3SQLFreeHandle 52 -#define ODBC3SQLGetCursorName 53 -#define ODBC3SQLNativeSql 54 +#define ODBC3SQLAllocHandle 1 +#define ODBC3SQLConnect 2 +#define ODBC3SQLDriverConnect 3 +#define ODBC3SQLBrowseConnect 4 +#define ODBC3SQLDataSources 5 +#define ODBC3SQLDrivers 6 +#define ODBC3SQLGetInfo 7 +#define ODBC3SQLGetFunctions 8 +#define ODBC3SQLGetTypeInfo 9 +#define ODBC3SQLSetConnectAttr 10 +#define ODBC3SQLGetConnectAttr 11 +#define ODBC3SQLSetEnvAttr 12 +#define ODBC3SQLGetEnvAttr 13 +#define ODBC3SQLSetStmtAttr 14 +#define ODBC3SQLGetStmtAttr 15 +#define ODBC3SQLPrepare 16 +#define ODBC3SQLBindParameter 17 +#define ODBC3SQLSetCursorName 18 +#define ODBC3SQLExecute 19 +#define ODBC3SQLExecDirect 20 +#define ODBC3SQLDescribeParam 21 +#define ODBC3SQLNumParams 22 +#define ODBC3SQLParamData 23 +#define ODBC3SQLPutData 24 +#define ODBC3SQLRowCount 25 +#define ODBC3SQLNumResultCols 26 +#define ODBC3SQLDescribeCol 27 +#define ODBC3SQLColAttribute 28 +#define ODBC3SQLBindCol 29 +#define ODBC3SQLFetch 30 +#define ODBC3SQLFetchScroll 31 +#define ODBC3SQLGetData 32 +#define ODBC3SQLSetPos 33 +#define ODBC3SQLBulkOperations 34 +#define ODBC3SQLMoreResults 35 +#define ODBC3SQLGetDiagRec 36 +#define ODBC3SQLColumnPrivileges 37 +#define ODBC3SQLColumns 38 +#define ODBC3SQLForeignKeys 39 +#define ODBC3SQLPrimaryKeys 40 +#define ODBC3SQLProcedureColumns 41 +#define ODBC3SQLProcedures 42 +#define ODBC3SQLSpecialColumns 43 +#define ODBC3SQLStatistics 44 +#define ODBC3SQLTablePrivileges 45 +#define ODBC3SQLTables 46 +#define ODBC3SQLFreeStmt 47 +#define ODBC3SQLCloseCursor 48 +#define ODBC3SQLCancel 49 +#define ODBC3SQLEndTran 50 +#define ODBC3SQLDisconnect 51 +#define ODBC3SQLFreeHandle 52 +#define ODBC3SQLGetCursorName 53 +#define ODBC3SQLNativeSql 54 namespace connectivity { @@ -101,12 +101,12 @@ namespace connectivity class OConnection; const sal_uInt32 ODBC_FRACTION_UNITS_PER_HSECOND = 10000000L; - const sal_Int32 MAX_PUT_DATA_LENGTH = 2000; + const sal_Int32 MAX_PUT_DATA_LENGTH = 2000; class OOO_DLLPUBLIC_ODBCBASE OTools { public: - static void ThrowException( OConnection* _pConnection, + static void ThrowException( OConnection* _pConnection, SQLRETURN _rRetCode, SQLHANDLE _pContext, SQLSMALLINT _nHandleType, @@ -115,7 +115,7 @@ namespace connectivity rtl_TextEncoding _nTextEncoding = RTL_TEXTENCODING_MS_1252) throw(::com::sun::star::sdbc::SQLException); - static void GetInfo(OConnection* _pConnection, + static void GetInfo(OConnection* _pConnection, SQLHANDLE _aConnectionHandle, SQLUSMALLINT _nInfo, ::rtl::OUString &_rValue, @@ -140,7 +140,7 @@ namespace connectivity SQLUSMALLINT _nInfo, SQLUINTEGER &_rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + static void GetInfo(OConnection* _pConnection, SQLHANDLE _aConnectionHandle, SQLUSMALLINT _nInfo, @@ -153,38 +153,38 @@ namespace connectivity static DATE_STRUCT DateToOdbcDate(const ::com::sun::star::util::Date& x) { DATE_STRUCT aVal; - aVal.year = x.Year; - aVal.month = x.Month; - aVal.day = x.Day; + aVal.year = x.Year; + aVal.month = x.Month; + aVal.day = x.Day; return aVal; } static TIME_STRUCT TimeToOdbcTime(const ::com::sun::star::util::Time& x) { TIME_STRUCT aVal; - aVal.hour = x.Hours; - aVal.minute = x.Minutes; - aVal.second = x.Seconds; + aVal.hour = x.Hours; + aVal.minute = x.Minutes; + aVal.second = x.Seconds; return aVal; } static TIMESTAMP_STRUCT DateTimeToTimestamp(const ::com::sun::star::util::DateTime& x) { TIMESTAMP_STRUCT aVal; - aVal.year = x.Year; - aVal.month = x.Month; - aVal.day = x.Day; - aVal.hour = x.Hours; - aVal.minute = x.Minutes; - aVal.second = x.Seconds; - aVal.fraction = x.HundredthSeconds * ODBC_FRACTION_UNITS_PER_HSECOND; + aVal.year = x.Year; + aVal.month = x.Month; + aVal.day = x.Day; + aVal.hour = x.Hours; + aVal.minute = x.Minutes; + aVal.second = x.Seconds; + aVal.fraction = x.HundredthSeconds * ODBC_FRACTION_UNITS_PER_HSECOND; return aVal; } - /** + /** getBindTypes set the ODBC type for C - @param _bUseWChar true when Unicode should be used - @param _bUseOldTimeDate true when the old datetime format should be used - @param _nOdbcType the ODBC sql type - @param fCType the C type for the ODBC type - @param fSqlType the SQL type for the ODBC type + @param _bUseWChar true when Unicode should be used + @param _bUseOldTimeDate true when the old datetime format should be used + @param _nOdbcType the ODBC sql type + @param fCType the C type for the ODBC type + @param fSqlType the SQL type for the ODBC type */ static void getBindTypes(sal_Bool _bUseWChar, sal_Bool _bUseOldTimeDate, @@ -192,7 +192,7 @@ namespace connectivity SQLSMALLINT& fCType, SQLSMALLINT& fSqlType); - static ::rtl::OUString getStringValue( OConnection* _pConnection, + static ::rtl::OUString getStringValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _fSqlType, @@ -200,13 +200,13 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection, + static ::com::sun::star::uno::Sequence<sal_Int8> getBytesValue(OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _fSqlType, sal_Bool &_bWasNull, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static void getValue( OConnection* _pConnection, + static void getValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _nType, @@ -215,16 +215,16 @@ namespace connectivity void* _pValue, SQLLEN _nSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - /** + /** bindData copies the from pValue to pData - @param _nOdbcType the ODBC sql type - @param _bUseWChar true when Unicode should be used - @param _pData contains a copy of the data to be set - @param _pValue contains the data to be copied - @param _nTextEncoding the text encoding - @param _nColumnSize the columnsize which is a out param + @param _nOdbcType the ODBC sql type + @param _bUseWChar true when Unicode should be used + @param _pData contains a copy of the data to be set + @param _pValue contains the data to be copied + @param _nTextEncoding the text encoding + @param _nColumnSize the columnsize which is a out param */ - static void bindData( SQLSMALLINT _nOdbcType, + static void bindData( SQLSMALLINT _nOdbcType, sal_Bool _bUseWChar, sal_Int8 *&_pData, SQLLEN*& pLen, @@ -232,9 +232,9 @@ namespace connectivity rtl_TextEncoding _nTextEncoding, SQLULEN& _nColumnSize); - static void bindParameter( OConnection* _pConnection, + static void bindParameter( OConnection* _pConnection, SQLHANDLE _hStmt, - sal_Int32 nPos, + sal_Int32 nPos, sal_Int8*& pDataBuffer, sal_Int8* pLenBuffer, SQLSMALLINT _nJDBCtype, @@ -245,20 +245,20 @@ namespace connectivity rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static void bindValue( OConnection* _pConnection, + static void bindValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _nType, SQLSMALLINT _nMaxLen, const void* _pValue, - void* _pData, + void* _pData, SQLLEN *pLen, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, rtl_TextEncoding _nTextEncoding, sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; - template <class T> void getValue( OConnection* _pConnection, + template <class T> void getValue( OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, SQLSMALLINT _nType, @@ -266,11 +266,11 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, T& _rValue) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - OTools::getValue(_pConnection,_aStatementHandle,columnIndex,_nType,_bWasNull,_xInterface,&_rValue,sizeof _rValue); + OTools::getValue(_pConnection,_aStatementHandle,columnIndex,_nType,_bWasNull,_xInterface,&_rValue,sizeof _rValue); } //----------------------------------------------------------------------------- - + } } #endif // _CONNECTIVITY_OTOOLS_HXX_ diff --git a/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx index e533ecdcdfd9..31ac8636e6c9 100644 --- a/connectivity/source/inc/odbc/odbcbasedllapi.hxx +++ b/connectivity/source/inc/odbc/odbcbasedllapi.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/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx index f9cce49cd62d..eaa2f3e08b2d 100644 --- a/connectivity/source/inc/propertyids.hxx +++ b/connectivity/source/inc/propertyids.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 @@ -60,7 +60,7 @@ namespace connectivity struct OOO_DLLPUBLIC_DBTOOLS UStringDescription { - const sal_Char* pZeroTerminatedName; + const sal_Char* pZeroTerminatedName; sal_Int32 nLength; UStringDescription(PVFN _fCharFkt); @@ -77,84 +77,84 @@ namespace connectivity #define DECL_PROP1IMPL(varname, type) \ pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)), //------------------------------------------------------------------------------ -#define DECL_PROP0(varname, type) \ +#define DECL_PROP0(varname, type) \ DECL_PROP1IMPL(varname, type) 0) //------------------------------------------------------------------------------ #define DECL_BOOL_PROP1IMPL(varname) \ pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getBooleanCppuType(), //------------------------------------------------------------------------------ -#define DECL_BOOL_PROP0(varname) \ +#define DECL_BOOL_PROP0(varname) \ DECL_BOOL_PROP1IMPL(varname) 0) -#define PROPERTY_ID_QUERYTIMEOUT 1 -#define PROPERTY_ID_MAXFIELDSIZE 2 -#define PROPERTY_ID_MAXROWS 3 -#define PROPERTY_ID_CURSORNAME 4 -#define PROPERTY_ID_RESULTSETCONCURRENCY 5 -#define PROPERTY_ID_RESULTSETTYPE 6 -#define PROPERTY_ID_FETCHDIRECTION 7 -#define PROPERTY_ID_FETCHSIZE 8 -#define PROPERTY_ID_ESCAPEPROCESSING 9 -#define PROPERTY_ID_USEBOOKMARKS 10 +#define PROPERTY_ID_QUERYTIMEOUT 1 +#define PROPERTY_ID_MAXFIELDSIZE 2 +#define PROPERTY_ID_MAXROWS 3 +#define PROPERTY_ID_CURSORNAME 4 +#define PROPERTY_ID_RESULTSETCONCURRENCY 5 +#define PROPERTY_ID_RESULTSETTYPE 6 +#define PROPERTY_ID_FETCHDIRECTION 7 +#define PROPERTY_ID_FETCHSIZE 8 +#define PROPERTY_ID_ESCAPEPROCESSING 9 +#define PROPERTY_ID_USEBOOKMARKS 10 // Column -#define PROPERTY_ID_NAME 11 -#define PROPERTY_ID_TYPE 12 -#define PROPERTY_ID_TYPENAME 13 -#define PROPERTY_ID_PRECISION 14 -#define PROPERTY_ID_SCALE 15 -#define PROPERTY_ID_ISNULLABLE 16 -#define PROPERTY_ID_ISAUTOINCREMENT 17 -#define PROPERTY_ID_ISROWVERSION 18 -#define PROPERTY_ID_DESCRIPTION 19 -#define PROPERTY_ID_DEFAULTVALUE 20 - -#define PROPERTY_ID_REFERENCEDTABLE 21 -#define PROPERTY_ID_UPDATERULE 22 -#define PROPERTY_ID_DELETERULE 23 -#define PROPERTY_ID_CATALOG 24 -#define PROPERTY_ID_ISUNIQUE 25 -#define PROPERTY_ID_ISPRIMARYKEYINDEX 26 -#define PROPERTY_ID_ISCLUSTERED 27 -#define PROPERTY_ID_ISASCENDING 28 -#define PROPERTY_ID_SCHEMANAME 29 -#define PROPERTY_ID_CATALOGNAME 30 - -#define PROPERTY_ID_COMMAND 31 -#define PROPERTY_ID_CHECKOPTION 32 -#define PROPERTY_ID_PASSWORD 33 -#define PROPERTY_ID_RELATEDCOLUMN 34 - -#define PROPERTY_ID_FUNCTION 35 -#define PROPERTY_ID_TABLENAME 36 -#define PROPERTY_ID_REALNAME 37 -#define PROPERTY_ID_DBASEPRECISIONCHANGED 38 -#define PROPERTY_ID_ISCURRENCY 39 -#define PROPERTY_ID_ISBOOKMARKABLE 40 - -#define PROPERTY_ID_INVALID_INDEX 41 -#define PROPERTY_ID_HY010 43 +#define PROPERTY_ID_NAME 11 +#define PROPERTY_ID_TYPE 12 +#define PROPERTY_ID_TYPENAME 13 +#define PROPERTY_ID_PRECISION 14 +#define PROPERTY_ID_SCALE 15 +#define PROPERTY_ID_ISNULLABLE 16 +#define PROPERTY_ID_ISAUTOINCREMENT 17 +#define PROPERTY_ID_ISROWVERSION 18 +#define PROPERTY_ID_DESCRIPTION 19 +#define PROPERTY_ID_DEFAULTVALUE 20 + +#define PROPERTY_ID_REFERENCEDTABLE 21 +#define PROPERTY_ID_UPDATERULE 22 +#define PROPERTY_ID_DELETERULE 23 +#define PROPERTY_ID_CATALOG 24 +#define PROPERTY_ID_ISUNIQUE 25 +#define PROPERTY_ID_ISPRIMARYKEYINDEX 26 +#define PROPERTY_ID_ISCLUSTERED 27 +#define PROPERTY_ID_ISASCENDING 28 +#define PROPERTY_ID_SCHEMANAME 29 +#define PROPERTY_ID_CATALOGNAME 30 + +#define PROPERTY_ID_COMMAND 31 +#define PROPERTY_ID_CHECKOPTION 32 +#define PROPERTY_ID_PASSWORD 33 +#define PROPERTY_ID_RELATEDCOLUMN 34 + +#define PROPERTY_ID_FUNCTION 35 +#define PROPERTY_ID_TABLENAME 36 +#define PROPERTY_ID_REALNAME 37 +#define PROPERTY_ID_DBASEPRECISIONCHANGED 38 +#define PROPERTY_ID_ISCURRENCY 39 +#define PROPERTY_ID_ISBOOKMARKABLE 40 + +#define PROPERTY_ID_INVALID_INDEX 41 +#define PROPERTY_ID_HY010 43 #define PROPERTY_ID_LABEL 44 -#define PROPERTY_ID_DELIMITER 45 -#define PROPERTY_ID_FORMATKEY 46 -#define PROPERTY_ID_LOCALE 47 -#define PROPERTY_ID_IM001 48 - -#define PROPERTY_ID_AUTOINCREMENTCREATION 49 - -#define PROPERTY_ID_PRIVILEGES 50 -#define PROPERTY_ID_HAVINGCLAUSE 51 - -#define PROPERTY_ID_ISSIGNED 52 -#define PROPERTY_ID_AGGREGATEFUNCTION 53 -#define PROPERTY_ID_ISSEARCHABLE 54 - -#define PROPERTY_ID_APPLYFILTER 55 -#define PROPERTY_ID_FILTER 56 -#define PROPERTY_ID_MASTERFIELDS 57 -#define PROPERTY_ID_DETAILFIELDS 58 -#define PROPERTY_ID_FIELDTYPE 59 -#define PROPERTY_ID_VALUE 60 +#define PROPERTY_ID_DELIMITER 45 +#define PROPERTY_ID_FORMATKEY 46 +#define PROPERTY_ID_LOCALE 47 +#define PROPERTY_ID_IM001 48 + +#define PROPERTY_ID_AUTOINCREMENTCREATION 49 + +#define PROPERTY_ID_PRIVILEGES 50 +#define PROPERTY_ID_HAVINGCLAUSE 51 + +#define PROPERTY_ID_ISSIGNED 52 +#define PROPERTY_ID_AGGREGATEFUNCTION 53 +#define PROPERTY_ID_ISSEARCHABLE 54 + +#define PROPERTY_ID_APPLYFILTER 55 +#define PROPERTY_ID_FILTER 56 +#define PROPERTY_ID_MASTERFIELDS 57 +#define PROPERTY_ID_DETAILFIELDS 58 +#define PROPERTY_ID_FIELDTYPE 59 +#define PROPERTY_ID_VALUE 60 #define PROPERTY_ID_ACTIVE_CONNECTION 61 #endif // _CONNECTIVITY_PROPERTYIDS_HXX_ diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc index a5911dcd0e98..edceb2658cf6 100644 --- a/connectivity/source/inc/resource/adabas_res.hrc +++ b/connectivity/source/inc/resource/adabas_res.hrc @@ -1,7 +1,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/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc index 717e194ca3a4..115936ea3794 100644 --- a/connectivity/source/inc/resource/ado_res.hrc +++ b/connectivity/source/inc/resource/ado_res.hrc @@ -1,7 +1,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/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc index e71901814140..fbb86e5fa4cb 100644 --- a/connectivity/source/inc/resource/calc_res.hrc +++ b/connectivity/source/inc/resource/calc_res.hrc @@ -1,7 +1,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/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc index ac7cb89a630e..543231c4e15d 100644 --- a/connectivity/source/inc/resource/common_res.hrc +++ b/connectivity/source/inc/resource/common_res.hrc @@ -1,7 +1,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/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc index 981f5a89b4df..45f839925969 100644 --- a/connectivity/source/inc/resource/conn_shared_res.hrc +++ b/connectivity/source/inc/resource/conn_shared_res.hrc @@ -1,7 +1,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/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc index d4b31e614ced..698f31dd7ac8 100644 --- a/connectivity/source/inc/resource/dbase_res.hrc +++ b/connectivity/source/inc/resource/dbase_res.hrc @@ -1,7 +1,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/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc index ebe7170beb96..73f6214c24a4 100644 --- a/connectivity/source/inc/resource/evoab2_res.hrc +++ b/connectivity/source/inc/resource/evoab2_res.hrc @@ -1,7 +1,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/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc index bbc451920ef4..b5b7b98073b0 100644 --- a/connectivity/source/inc/resource/file_res.hrc +++ b/connectivity/source/inc/resource/file_res.hrc @@ -1,7 +1,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/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc index 640ed8f5ce81..c2b1f077699b 100644 --- a/connectivity/source/inc/resource/hsqldb_res.hrc +++ b/connectivity/source/inc/resource/hsqldb_res.hrc @@ -1,7 +1,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/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc index ff2c483f0948..e12e91516a2b 100644 --- a/connectivity/source/inc/resource/jdbc_log.hrc +++ b/connectivity/source/inc/resource/jdbc_log.hrc @@ -1,7 +1,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/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc index b03eecdb2b90..789d4a832ded 100644 --- a/connectivity/source/inc/resource/kab_res.hrc +++ b/connectivity/source/inc/resource/kab_res.hrc @@ -1,7 +1,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/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc index 74d64aa28ad8..fca426111cdb 100644 --- a/connectivity/source/inc/resource/macab_res.hrc +++ b/connectivity/source/inc/resource/macab_res.hrc @@ -1,7 +1,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/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc index 01e93ae17fd5..30aaa791f766 100644 --- a/connectivity/source/inc/resource/mozab_res.hrc +++ b/connectivity/source/inc/resource/mozab_res.hrc @@ -1,7 +1,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/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index aaac66c20539..ae6a770ce539 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.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,7 +74,7 @@ namespace connectivity the ASCII string which is to search in the string. Must not be <NULL/>. @param _rStringToSubstitute the String which should substitute the ASCII pattern. - + @return the string from the resource file, with applied string substitution */ @@ -98,7 +98,7 @@ namespace connectivity the ASCII string (2) which is to search in the string. Must not be <NULL/>. @param _rStringToSubstitute2 the String which should substitute the ASCII pattern (2) - + @return the string from the resource file, with applied string substitution */ @@ -128,7 +128,7 @@ namespace connectivity the ASCII string (3) which is to search in the string. Must not be <NULL/>. @param _rStringToSubstitute3 the String which should substitute the ASCII pattern (3) - + @return the string from the resource file, with applied string substitution */ diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx index 8a5004a29b00..b9b482c241fc 100644 --- a/connectivity/source/inc/sqlscan.hxx +++ b/connectivity/source/inc/sqlscan.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 @@ -41,13 +41,13 @@ namespace connectivity */ class OOO_DLLPUBLIC_DBTOOLS OSQLScanner { - const IParseContext* m_pContext; // context for parse, knows all international stuff - ::rtl::OString m_sStatement; // statement to parse - ::rtl::OUString m_sErrorMessage; + const IParseContext* m_pContext; // context for parse, knows all international stuff + ::rtl::OString m_sStatement; // statement to parse + ::rtl::OUString m_sErrorMessage; - sal_Int32 m_nCurrentPos; // next position to read from the statement - sal_Bool m_bInternational; // do we have a statement which may uses - sal_Int32 m_nRule; // rule to be set + sal_Int32 m_nCurrentPos; // next position to read from the statement + sal_Bool m_bInternational; // do we have a statement which may uses + sal_Int32 m_nRule; // rule to be set public: OSQLScanner(); @@ -78,12 +78,12 @@ namespace connectivity void setScanner(sal_Bool _bNull=sal_False); // rules settings void SetRule(sal_Int32 nRule) {m_nRule = nRule;} - sal_Int32 GetCurrentRule() const; - sal_Int32 GetGERRule() const; - sal_Int32 GetENGRule() const; - sal_Int32 GetSQLRule() const; - sal_Int32 GetDATERule() const; - sal_Int32 GetSTRINGRule() const; + sal_Int32 GetCurrentRule() const; + sal_Int32 GetGERRule() const; + sal_Int32 GetENGRule() const; + sal_Int32 GetSQLRule() const; + sal_Int32 GetDATERule() const; + sal_Int32 GetSTRINGRule() const; inline sal_Int32 GetCurrentPos() const { return m_nCurrentPos; } }; } diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index e07d051f2099..ce8128c6edad 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.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 @@ -59,7 +59,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::logging; using namespace ::osl; -#define SERVICE_SDBC_DRIVER ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver") +#define SERVICE_SDBC_DRIVER ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver") void throwNoSuchElementException() throw(NoSuchElementException) { @@ -74,8 +74,8 @@ class ODriverEnumeration : public ::cppu::WeakImplHelper1< XEnumeration > friend class OSDBCDriverManager; DECLARE_STL_VECTOR( SdbcDriver, DriverArray ); - DriverArray m_aDrivers; - ConstDriverArrayIterator m_aPos; + DriverArray m_aDrivers; + ConstDriverArrayIterator m_aPos; // order matters! protected: @@ -339,7 +339,7 @@ void OSDBCDriverManager::bootstrapDrivers() // can it tell us something about the implementation name? xSI = xSI.query( xFactory ); if ( xSI.is() ) - { // yes -> no need to load the driver immediately (load it later when needed) + { // yes -> no need to load the driver immediately (load it later when needed) aDriverDescriptor.sImplementationName = xSI->getImplementationName(); aDriverDescriptor.xComponentFactory = xFactory; bValidDescriptor = sal_True; @@ -414,8 +414,8 @@ void OSDBCDriverManager::initializeDriverPrecedence() ::std::sort( m_aDriversBS.begin(), m_aDriversBS.end(), CompareDriverAccessByName() ); // loop through the names in the precedence order - const ::rtl::OUString* pDriverOrder = aDriverOrder.getConstArray(); - const ::rtl::OUString* pDriverOrderEnd = pDriverOrder + aDriverOrder.getLength(); + const ::rtl::OUString* pDriverOrder = aDriverOrder.getConstArray(); + const ::rtl::OUString* pDriverOrderEnd = pDriverOrder + aDriverOrder.getLength(); // the first driver for which there is no preference DriverAccessArrayIterator aNoPrefDriversStart = m_aDriversBS.begin(); @@ -428,14 +428,14 @@ void OSDBCDriverManager::initializeDriverPrecedence() ::std::equal_range( aNoPrefDriversStart, m_aDriversBS.end(), *pDriverOrder, CompareDriverAccessToName() ); if ( aPos.first != aPos.second ) - { // we have a DriverAccess with this impl name + { // we have a DriverAccess with this impl name OSL_ENSURE( ::std::distance( aPos.first, aPos.second ) == 1, "OSDBCDriverManager::initializeDriverPrecedence: more than one driver with this impl name? How this?" ); // move the DriverAccess pointed to by aPos.first to the position pointed to by aNoPrefDriversStart if ( aPos.first != aNoPrefDriversStart ) - { // if this does not hold, the DriverAccess alread has the correct position + { // if this does not hold, the DriverAccess alread has the correct position // rotate the range [aNoPrefDriversStart, aPos.second) right 1 element ::std::rotate( aNoPrefDriversStart, aPos.second - 1, aPos.second ); @@ -530,18 +530,18 @@ Reference< XEnumeration > SAL_CALL OSDBCDriverManager::createEnumeration( ) thr // copy the bootstrapped drivers ::std::transform( - m_aDriversBS.begin(), // "copy from" start - m_aDriversBS.end(), // "copy from" end - ::std::back_inserter( aDrivers ), // insert into - ExtractDriverFromAccess() // transformation to apply (extract a driver from a driver access) + m_aDriversBS.begin(), // "copy from" start + m_aDriversBS.end(), // "copy from" end + ::std::back_inserter( aDrivers ), // insert into + ExtractDriverFromAccess() // transformation to apply (extract a driver from a driver access) ); // append the runtime drivers ::std::transform( - m_aDriversRT.begin(), // "copy from" start - m_aDriversRT.end(), // "copy from" end - ::std::back_inserter( aDrivers ), // insert into - ExtractDriverFromCollectionElement() // transformation to apply (extract a driver from a driver access) + m_aDriversRT.begin(), // "copy from" start + m_aDriversRT.end(), // "copy from" end + ::std::back_inserter( aDrivers ), // insert into + ExtractDriverFromCollectionElement() // transformation to apply (extract a driver from a driver access) ); return new ODriverEnumeration( aDrivers ); @@ -705,8 +705,8 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const ::rtl::OUStri { // search all bootstrapped drivers aFind = ::std::find_if( - m_aDriversBS.begin(), // begin of search range - m_aDriversBS.end(), // end of search range + m_aDriversBS.begin(), // begin of search range + m_aDriversBS.end(), // end of search range std::unary_compose< AcceptsURL, ExtractAfterLoad >( AcceptsURL( _rURL ), ExtractAfterLoad() ) // compose two functors: extract the driver from the access, then ask the resulting driver for acceptance ); @@ -726,8 +726,8 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const ::rtl::OUStri { // no -> search the runtime drivers DriverCollectionIterator aPos = ::std::find_if( - m_aDriversRT.begin(), // begin of search range - m_aDriversRT.end(), // end of search range + m_aDriversRT.begin(), // begin of search range + m_aDriversRT.end(), // end of search range std::unary_compose< AcceptsURL, ExtractDriverFromCollectionElement >( AcceptsURL( _rURL ), ExtractDriverFromCollectionElement() ) // compose two functors: extract the driver from the access, then ask the resulting driver for acceptance ); @@ -739,6 +739,6 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const ::rtl::OUStri return xReturn; } -} // namespace drivermanager +} // namespace drivermanager /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index 2bd22dd6cf68..ec6f38645b80 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.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,45 +50,45 @@ namespace drivermanager //====================================================================== //= various //====================================================================== - typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SdbcDriver; + typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SdbcDriver; DECLARE_STL_USTRINGACCESS_MAP( SdbcDriver, DriverCollection ); - typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > DriverFactory; + typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > DriverFactory; struct DriverAccess { - ::rtl::OUString sImplementationName; /// the implementation name of the driver - DriverFactory xComponentFactory; /// the factory to create the driver component (if not already done so) - SdbcDriver xDriver; /// the driver itself + ::rtl::OUString sImplementationName; /// the implementation name of the driver + DriverFactory xComponentFactory; /// the factory to create the driver component (if not already done so) + SdbcDriver xDriver; /// the driver itself }; //========================================================================== //= OSDBCDriverManager - the one-instance service for managing SDBC drivers //========================================================================== - typedef ::cppu::WeakImplHelper5 < ::com::sun::star::sdbc::XDriverManager - , ::com::sun::star::sdbc::XDriverAccess - , ::com::sun::star::container::XEnumerationAccess - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::uno::XNamingService - > OSDBCDriverManager_Base; + typedef ::cppu::WeakImplHelper5 < ::com::sun::star::sdbc::XDriverManager + , ::com::sun::star::sdbc::XDriverAccess + , ::com::sun::star::container::XEnumerationAccess + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::uno::XNamingService + > OSDBCDriverManager_Base; class OSDBCDriverManager : public OSDBCDriverManager_Base { friend class ODriverEnumeration; - - ::osl::Mutex m_aMutex; + + ::osl::Mutex m_aMutex; ::comphelper::ComponentContext m_aContext; ::comphelper::EventLogger m_aEventLogger; DECLARE_STL_VECTOR(DriverAccess, DriverAccessArray); - DriverAccessArray m_aDriversBS; + DriverAccessArray m_aDriversBS; // for drivers registered at runtime (not bootstrapped) we don't require an XServiceInfo interface, // so we have to remember their impl-name in another way DECLARE_STL_USTRINGACCESS_MAP(SdbcDriver, DriverCollection); - DriverCollection m_aDriversRT; + DriverCollection m_aDriversRT; - ::connectivity::DriversConfig m_aDriverConfig; - sal_Int32 m_nLoginTimeout; + ::connectivity::DriversConfig m_aDriverConfig; + sal_Int32 m_nLoginTimeout; private: OSDBCDriverManager( @@ -140,7 +140,7 @@ namespace drivermanager void bootstrapDrivers(); }; -} // namespace drivermanager +} // namespace drivermanager #endif // _CONNECTIVITY_DRIVERMANAGER_HXX_ diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx index afc23aaff31a..b77ea9268eca 100644 --- a/connectivity/source/manager/mregistration.cxx +++ b/connectivity/source/manager/mregistration.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 @@ -108,7 +108,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplN return pRet; } -} // extern "C" +} // extern "C" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index 25eddfd52f47..bdbe4bbb6b09 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.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 @@ -44,19 +44,19 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; // ------------------------------------------------------------------------- -OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool _bCase) - : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) - , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) - , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))) - , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))) - , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) - , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))) - , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))) - , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) - , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))) - , sal_False - , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))) - , _bCase +OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool _bCase) + : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) + , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))) + , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))) + , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) + , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))) + , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))) + , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) + , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))) + , sal_False + , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))) + , _bCase ) , m_bFunction(sal_False) , m_bDbasePrecisionChanged(sal_False) @@ -67,17 +67,17 @@ OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool } // ------------------------------------------------------------------------- -OParseColumn::OParseColumn( const ::rtl::OUString& _Name, +OParseColumn::OParseColumn( 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 _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 ) : connectivity::sdbcx::OColumn(_Name, _TypeName, _DefaultValue, @@ -174,13 +174,13 @@ OParseColumn::~OParseColumn() // ------------------------------------------------------------------------- void OParseColumn::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(reinterpret_cast<sal_Bool*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(reinterpret_cast<sal_Bool*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const @@ -194,21 +194,21 @@ void OParseColumn::construct() return *OParseColumn_PROP::getArrayHelper(); } // ----------------------------------------------------------------------------- -OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn - ,sal_Bool _bCase +OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn + ,sal_Bool _bCase ,sal_Bool _bAscending) - : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) - , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) - , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))) - , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))) - , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) - , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))) - , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))) - , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) - , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))) - , sal_False - , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))) - , _bCase + : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) + , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) + , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))) + , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))) + , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) + , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))) + , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))) + , getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) + , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))) + , sal_False + , getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))) + , _bCase ) , m_bAscending(_bAscending) { @@ -221,13 +221,13 @@ OOrderColumn::~OOrderColumn() // ------------------------------------------------------------------------- void OOrderColumn::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING),PROPERTY_ID_ISASCENDING,0,&m_bAscending, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING),PROPERTY_ID_ISASCENDING,0,&m_bAscending, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const { return doCreateArrayHelper(); -} +} // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & SAL_CALL OOrderColumn::getInfoHelper() { diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx index db1f1585b7b7..a6c84f72a064 100644 --- a/connectivity/source/parse/internalnode.cxx +++ b/connectivity/source/parse/internalnode.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/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index ef07f908836a..799557a79d68 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.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 @@ -51,7 +51,7 @@ #include "diagnose_ex.h" #include <rtl/logfile.hxx> -#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ +#define SQL_ISRULEOR2(pParseNode, e1,e2) ((pParseNode)->isRule() && (\ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e1) || \ (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::e2))) @@ -86,7 +86,7 @@ namespace connectivity bool m_bIsCaseSensitive; - OSQLParseTreeIteratorImpl( const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxTables ) + OSQLParseTreeIteratorImpl( const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxTables ) :m_xConnection( _rxConnection ) ,m_nIncludeMask( OSQLParseTreeIterator::All ) ,m_bIsCaseSensitive( true ) @@ -192,13 +192,13 @@ bool OSQLParseTreeIterator::isCaseSensitive() const void OSQLParseTreeIterator::dispose() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::dispose" ); - m_aSelectColumns = NULL; - m_aGroupColumns = NULL; - m_aOrderColumns = NULL; - m_aParameters = NULL; - m_pImpl->m_xTableContainer = NULL; + m_aSelectColumns = NULL; + m_aGroupColumns = NULL; + m_aOrderColumns = NULL; + m_aParameters = NULL; + m_pImpl->m_xTableContainer = NULL; m_pImpl->m_xDatabaseMetaData = NULL; - m_aCreateColumns = NULL; + m_aCreateColumns = NULL; m_pImpl->m_pTables->clear(); m_pImpl->m_pSubTables->clear(); } @@ -212,7 +212,7 @@ void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree) m_aSelectColumns = new OSQLColumns(); m_aGroupColumns = new OSQLColumns(); m_aOrderColumns = new OSQLColumns(); - m_aParameters = new OSQLColumns(); + m_aParameters = new OSQLColumns(); m_aCreateColumns = new OSQLColumns(); m_pParseTree = pNewParseTree; @@ -289,7 +289,7 @@ namespace Sequence< ::rtl::OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; - sTableTypes[2] = s_sWildcard; // just to be sure to include anything else .... + sTableTypes[2] = s_sWildcard; // just to be sure to include anything else .... if ( _rxDBMeta.is() ) { @@ -464,7 +464,7 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQ // Tabellenname abholen OSQLParseNode::getTableComponents(pTableName,aCatalog,aSchema,aTableName,m_pImpl->m_xDatabaseMetaData); - + // create the composed name like DOMAIN.USER.TABLE1 aComposedName = ::dbtools::composeTableName(m_pImpl->m_xDatabaseMetaData, aCatalog.hasValue() ? ::comphelper::getString(aCatalog) : ::rtl::OUString(), @@ -485,13 +485,13 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQ //----------------------------------------------------------------------------- void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoinCondition) { - if (i_pJoinCondition->count() == 3 && // Ausdruck is geklammert + if (i_pJoinCondition->count() == 3 && // Ausdruck is geklammert SQL_ISPUNCTUATION(i_pJoinCondition->getChild(0),"(") && SQL_ISPUNCTUATION(i_pJoinCondition->getChild(2),")")) { impl_fillJoinConditions(i_pJoinCondition->getChild(1)); } - else if (SQL_ISRULEOR2(i_pJoinCondition,search_condition,boolean_term) && // AND/OR-Verknuepfung: + else if (SQL_ISRULEOR2(i_pJoinCondition,search_condition,boolean_term) && // AND/OR-Verknuepfung: i_pJoinCondition->count() == 3) { // nur AND Verknüpfung zulassen @@ -568,7 +568,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables, OSL_PRECOND( SQL_ISRULE( pTableRef, table_ref ) || SQL_ISRULE( pTableRef, joined_table ) || SQL_ISRULE( pTableRef, qualified_join ) || SQL_ISRULE( pTableRef, cross_union ), "OSQLParseTreeIterator::getTableNode: only to be called for table_ref nodes!" ); - + const OSQLParseNode* pTableNameNode = NULL; if ( SQL_ISRULE( pTableRef, joined_table ) ) @@ -650,7 +650,7 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLP // Tabellenreferenz kann aus Tabellennamen, Tabellennamen (+),'('joined_table')'(+) bestehen pTableName = pTableListElement->getChild(0); if( isTableNode( pTableName ) ) - { // Tabellennamen gefunden + { // Tabellennamen gefunden aTableRange = OSQLParseNode::getTableRange(pTableListElement); traverseOneTableName( _rTables, pTableName, aTableRange ); } @@ -672,7 +672,7 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLP getQualified_join( _rTables, pTableListElement->getChild(1), aTableRange ); } - // if (! aIteratorStatus.IsSuccessful()) break; + // if (! aIteratorStatus.IsSuccessful()) break; } } //----------------------------------------------------------------------------- @@ -777,23 +777,23 @@ namespace } // ----------------------------------------------------------------------------- -void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef, +void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef, ::rtl::OUString& _rColumnName, ::rtl::OUString& _rTableRange) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getColumnRange" ); ::rtl::OUString sDummy; - lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, NULL, sDummy ); + lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, NULL, sDummy ); } // ----------------------------------------------------------------------------- -void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef, +void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef, ::rtl::OUString& _rColumnName, ::rtl::OUString& _rTableRange, ::rtl::OUString& _out_rColumnAliasIfPresent ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getColumnRange" ); - lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, &*m_aSelectColumns, _out_rColumnAliasIfPresent ); + lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, &*m_aSelectColumns, _out_rColumnAliasIfPresent ); } //----------------------------------------------------------------------------- @@ -814,7 +814,7 @@ sal_Bool OSQLParseTreeIterator::getColumnTableRange(const OSQLParseNode* pNode, { ::rtl::OUString aColName, aTableRange; getColumnRange(pNode, aColName, aTableRange); - if (!aTableRange.getLength()) // keinen gefunden + if (!aTableRange.getLength()) // keinen gefunden { // dann die Spalte in den Tabellen suchen for (ConstOSQLTablesIterator aIter = m_pImpl->m_pTables->begin(); aIter != m_pImpl->m_pTables->end(); ++aIter) @@ -865,7 +865,7 @@ sal_Bool OSQLParseTreeIterator::getColumnTableRange(const OSQLParseNode* pNode, void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNode) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::traverseCreateColumns" ); - // aIteratorStatus.Clear(); + // aIteratorStatus.Clear(); if (!pSelectNode || m_eStatementType != SQL_STATEMENT_CREATE_TABLE || m_pImpl->m_pTables->empty()) { @@ -887,7 +887,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo sal_Int32 nType = DataType::VARCHAR; sal_Int32 nLen = 0; aColumnName = pColumnRef->getChild(0)->getTokenValue(); - + OSQLParseNode *pDatatype = pColumnRef->getChild(1); if (pDatatype && SQL_ISRULE(pDatatype,character_string_type)) { @@ -906,7 +906,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo { aTypeName = ::rtl::OUString::createFromAscii("VARCHAR"); } - + if (aTypeName.getLength()) { //TODO:Create a new class for create statement to handle field length @@ -920,7 +920,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo } } - } + } } //----------------------------------------------------------------------------- bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSelectNode) @@ -958,9 +958,9 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele OSQLParseNode *pColumnRef = pSelection->getChild(i); //if (SQL_ISRULE(pColumnRef,select_sublist)) - if (SQL_ISRULE(pColumnRef,derived_column) && - SQL_ISRULE(pColumnRef->getChild(0),column_ref) && - pColumnRef->getChild(0)->count() == 3 && + if (SQL_ISRULE(pColumnRef,derived_column) && + SQL_ISRULE(pColumnRef->getChild(0),column_ref) && + pColumnRef->getChild(0)->count() == 3 && SQL_ISPUNCTUATION(pColumnRef->getChild(0)->getChild(2),"*")) { // alle Spalten der Tabelle @@ -977,7 +977,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele sal_Int32 nType = DataType::VARCHAR; sal_Bool bFkt(sal_False); pColumnRef = pColumnRef->getChild(0); - if ( + if ( pColumnRef->count() == 3 && SQL_ISPUNCTUATION(pColumnRef->getChild(0),"(") && SQL_ISPUNCTUATION(pColumnRef->getChild(2),")") @@ -989,16 +989,16 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele getColumnRange(pColumnRef,sColumnName,aTableRange); OSL_ENSURE(sColumnName.getLength(),"Columnname darf nicht leer sein"); } - else /*if (SQL_ISRULE(pColumnRef,general_set_fct) || SQL_ISRULE(pColumnRef,set_fct_spec) || - SQL_ISRULE(pColumnRef,position_exp) || SQL_ISRULE(pColumnRef,extract_exp) || - SQL_ISRULE(pColumnRef,length_exp) || SQL_ISRULE(pColumnRef,char_value_fct)|| - SQL_ISRULE(pColumnRef,num_value_exp) || SQL_ISRULE(pColumnRef,term))*/ + else /*if (SQL_ISRULE(pColumnRef,general_set_fct) || SQL_ISRULE(pColumnRef,set_fct_spec) || + SQL_ISRULE(pColumnRef,position_exp) || SQL_ISRULE(pColumnRef,extract_exp) || + SQL_ISRULE(pColumnRef,length_exp) || SQL_ISRULE(pColumnRef,char_value_fct)|| + SQL_ISRULE(pColumnRef,num_value_exp) || SQL_ISRULE(pColumnRef,term))*/ { /* Funktionsaufruf vorhanden */ pColumnRef->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_True ); ::rtl::OUString sTableRange; // check if the column is also a parameter - traverseORCriteria(pColumnRef); // num_value_exp + traverseORCriteria(pColumnRef); // num_value_exp // gehoeren alle beteiligten Spalten der Funktion zu einer Tabelle if (m_pImpl->m_pTables->size() == 1) @@ -1012,7 +1012,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele if ( pColumnRef->isRule() ) { bFkt = sal_True; - nType = getFunctionReturnType(pColumnRef); + nType = getFunctionReturnType(pColumnRef); } } /* @@ -1044,9 +1044,9 @@ bool OSQLParseTreeIterator::traverseOrderByColumnNames(const OSQLParseNode* pSel void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNode,sal_Bool _bOrder) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::traverseByColumnNames" ); - // aIteratorStatus.Clear(); + // aIteratorStatus.Clear(); - if (pSelectNode == NULL) + if (pSelectNode == NULL) { //aIteratorStatus.setInvalidStatement(); return; @@ -1112,7 +1112,7 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo OSL_ENSURE(sColumnName.getLength(),"sColumnName darf nicht leer sein"); } else - { // here I found a predicate + { // here I found a predicate pColumnRef->parseNodeToStr( sColumnName, m_pImpl->m_xConnection, NULL, sal_False, sal_False ); } OSL_ENSURE(pColumnRef != NULL,"OSQLParseTreeIterator: error in parse tree!"); @@ -1222,7 +1222,7 @@ bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele // und Zeiger auf WHERE-Klausel setzen: OSQLParseNode * pWhereClause = NULL; - if (m_eStatementType == SQL_STATEMENT_SELECT) + if (m_eStatementType == SQL_STATEMENT_SELECT) { if(SQL_ISRULE(pSelectNode,union_statement)) { @@ -1277,7 +1277,7 @@ bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele void OSQLParseTreeIterator::traverseORCriteria(OSQLParseNode * pSearchCondition) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::traverseORCriteria" ); - + if ( pSearchCondition->count() == 3 && @@ -1294,7 +1294,7 @@ void OSQLParseTreeIterator::traverseORCriteria(OSQLParseNode * pSearchCondition) // OR-Verknuepfung: for (int i = 0; i < 3; i++) { - if (i == 1) continue; // Schluesselwort OR ueberspringen + if (i == 1) continue; // Schluesselwort OR ueberspringen // Ist das erste Element wieder eine OR-Verknuepfung? if (i == 0 && @@ -1308,16 +1308,16 @@ void OSQLParseTreeIterator::traverseORCriteria(OSQLParseNode * pSearchCondition) } else { // AND-Kriterien ... traverseANDCriteria(pSearchCondition->getChild(i)); - // if (! aIteratorStatus.IsSuccessful()) break; + // if (! aIteratorStatus.IsSuccessful()) break; } - // if (! aIteratorStatus.IsSuccessful()) break; + // if (! aIteratorStatus.IsSuccessful()) break; } } else { // Nur *ein* Kriterium oder eine AND-Verknuepfung von Kriterien. // Direkt die AND-Kriterien behandeln. traverseANDCriteria(pSearchCondition); - // if (! aIteratorStatus.IsSuccessful()) return; + // if (! aIteratorStatus.IsSuccessful()) return; } // Fehler einfach weiterreichen. @@ -1327,7 +1327,7 @@ void OSQLParseTreeIterator::traverseORCriteria(OSQLParseNode * pSearchCondition) void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::traverseANDCriteria" ); - + if ( SQL_ISRULE(pSearchCondition,boolean_primary) && @@ -1344,8 +1344,8 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition { // Dann rekursiv absteigen (dieselbe Row benutzen) ... traverseORCriteria(pSearchCondition->getChild(0)); -// if (! aIteratorStatus.IsSuccessful()) -// return; +// if (! aIteratorStatus.IsSuccessful()) +// return; // Und mit dem rechten Child weitermachen: traverseANDCriteria(pSearchCondition->getChild(2)); @@ -1355,8 +1355,8 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition { // Dann rekursiv absteigen (dieselbe Row benutzen) ... traverseANDCriteria(pSearchCondition->getChild(0)); -// if (! aIteratorStatus.IsSuccessful()) -// return; +// if (! aIteratorStatus.IsSuccessful()) +// return; // Und mit dem rechten Child weitermachen: traverseANDCriteria(pSearchCondition->getChild(2)); @@ -1368,8 +1368,8 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition pSearchCondition->getChild(2)->parseNodeToStr( aValue, m_pImpl->m_xConnection, NULL, sal_False, sal_False ); traverseOnePredicate(pSearchCondition->getChild(0),aValue,pSearchCondition->getChild(2)); impl_fillJoinConditions(pSearchCondition); -// if (! aIteratorStatus.IsSuccessful()) -// return; +// if (! aIteratorStatus.IsSuccessful()) +// return; } else if (SQL_ISRULE(pSearchCondition,like_predicate) /*&& SQL_ISRULE(pSearchCondition->getChild(0),column_ref)*/) { @@ -1378,15 +1378,15 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition sal_Int32 nCurentPos = pPart2->count()-2; - OSQLParseNode * pNum_value_exp = pPart2->getChild(nCurentPos); - OSQLParseNode * pOptEscape = pPart2->getChild(nCurentPos+1); + OSQLParseNode * pNum_value_exp = pPart2->getChild(nCurentPos); + OSQLParseNode * pOptEscape = pPart2->getChild(nCurentPos+1); OSL_ENSURE(pNum_value_exp != NULL,"OSQLParseTreeIterator: error in parse tree!"); OSL_ENSURE(pOptEscape != NULL,"OSQLParseTreeIterator: error in parse tree!"); if (pOptEscape->count() != 0) { - // aIteratorStatus.setStatementTooComplex(); + // aIteratorStatus.setStatementTooComplex(); return; } @@ -1404,8 +1404,8 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition } traverseOnePredicate(pSearchCondition->getChild(0),aValue,pParam); -// if (! aIteratorStatus.IsSuccessful()) -// return; +// if (! aIteratorStatus.IsSuccessful()) +// return; } else if (SQL_ISRULE(pSearchCondition,in_predicate)) { @@ -1413,7 +1413,7 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition const OSQLParseNode* pPart2 = pSearchCondition->getChild(1); traverseORCriteria(pSearchCondition->getChild(0)); - // if (! aIteratorStatus.IsSuccessful()) return; + // if (! aIteratorStatus.IsSuccessful()) return; OSQLParseNode* pChild = pPart2->getChild(2); if ( SQL_ISRULE(pChild->getChild(0),subquery) ) @@ -1440,8 +1440,8 @@ void OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition ::rtl::OUString aString; traverseOnePredicate(pSearchCondition->getChild(0),aString,NULL); - // if (! aIteratorStatus.IsSuccessful()) return; - } + // if (! aIteratorStatus.IsSuccessful()) return; + } else if (SQL_ISRULE(pSearchCondition,num_value_exp) || SQL_ISRULE(pSearchCondition,term)) { ::rtl::OUString aString; @@ -1504,7 +1504,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode } sal_Int32 nType = ::connectivity::OSQLParser::getFunctionParameterType( _pColumnRef->getParent()->getChild(0)->getTokenID(), i+1); - OParseColumn* pColumn = new OParseColumn( sParameterName, + OParseColumn* pColumn = new OParseColumn( sParameterName, ::rtl::OUString(), ::rtl::OUString(), ::rtl::OUString(), @@ -1526,7 +1526,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode OSQLColumns::Vector::const_iterator aIter = ::connectivity::find( m_aSelectColumns->get().begin(), m_aSelectColumns->get().end(), - _aColumnName,::comphelper::UStringMixEqual( isCaseSensitive() ) + _aColumnName,::comphelper::UStringMixEqual( isCaseSensitive() ) ); if(aIter != m_aSelectColumns->get().end()) { @@ -1608,7 +1608,7 @@ void OSQLParseTreeIterator::traverseOnePredicate( else { traverseORCriteria(pParseNode); - // if (! aIteratorStatus.IsSuccessful()) return; + // if (! aIteratorStatus.IsSuccessful()) return; } } @@ -1652,8 +1652,8 @@ void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask ) break; case SQL_STATEMENT_CREATE_TABLE: { - //0 | 1 | 2 |3| 4 |5 - //create table sc.foo ( a char(20), b char ) + //0 | 1 | 2 |3| 4 |5 + //create table sc.foo ( a char(20), b char ) const OSQLParseNode* pCreateNode = m_pParseTree->getChild(4); traverseCreateColumns(pCreateNode); } @@ -1676,7 +1676,7 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const ::rtl::OUString& "OSQLParseTreeIterator::impl_createTableObject: only to be called for CREATE TABLE statements!" ); // (in all other cases, m_pTables is to contain the table objects as obtained from the tables // container of the connection (m_xTablesContainer) - + OSQLTable aReturnTable = new OTable( NULL, sal_False, @@ -1692,7 +1692,7 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const ::rtl::OUString& void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::appendColumns" ); - + if (!_rTable.is()) return; @@ -1706,22 +1706,22 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColum for(;pBegin != pEnd;++pBegin) { - + ::rtl::OUString aName(getUniqueColumnName(*pBegin)); Reference< XPropertySet > xColumn; if(xColumns->hasByName(*pBegin) && (xColumns->getByName(*pBegin) >>= xColumn) && xColumn.is()) { OParseColumn* pColumn = new OParseColumn(aName - , getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) - , getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))) - , getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))) - , getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) - , getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))) - , getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))) - , getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) - , getBOOL(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))) - , getBOOL(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))) - , isCaseSensitive() ); + , getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) + , getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))) + , getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))) + , getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))) + , getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))) + , getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))) + , getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) + , getBOOL(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))) + , getBOOL(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))) + , isCaseSensitive() ); pColumn->setTableName(_rTableAlias); pColumn->setRealName(*pBegin); @@ -1730,7 +1730,7 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColum } else impl_appendError( IParseContext::ERROR_INVALID_COLUMN, pBegin, &_rTableAlias ); - } + } } //----------------------------------------------------------------------------- void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt,sal_Int32 _nType,sal_Bool bAggFkt) @@ -1763,7 +1763,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ continue; Reference<XNameAccess> xColumns = aIter->second->getColumns(); - Reference< XPropertySet > xColumn; + Reference< XPropertySet > xColumn; if ( !xColumns->hasByName( rColumnName ) || !( xColumns->getByName( rColumnName ) >>= xColumn ) ) @@ -1822,7 +1822,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ _rColumns->get().push_back(xCol); } } - else // ColumnName und Tablename vorhanden + else // ColumnName und Tablename vorhanden { ConstOSQLTablesIterator aFind = m_pImpl->m_pTables->find(rTableRange); @@ -1873,7 +1873,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ OParseColumn* pColumn = new OParseColumn(aNewColName,::rtl::OUString(),::rtl::OUString(),::rtl::OUString(), ColumnValue::NULLABLE_UNKNOWN,0,0,DataType::VARCHAR,sal_False,sal_False,isCaseSensitive()); pColumn->setFunction(sal_True); - pColumn->setAggregateFunction(bAggFkt); + pColumn->setAggregateFunction(bAggFkt); Reference< XPropertySet> xCol = pColumn; _rColumns->get().push_back(xCol); @@ -1881,7 +1881,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ } } //----------------------------------------------------------------------------- -::rtl::OUString OSQLParseTreeIterator::getUniqueColumnName(const ::rtl::OUString & rColumnName) const +::rtl::OUString OSQLParseTreeIterator::getUniqueColumnName(const ::rtl::OUString & rColumnName) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getUniqueColumnName" ); ::rtl::OUString aAlias(rColumnName); @@ -1912,7 +1912,7 @@ void OSQLParseTreeIterator::setOrderByColumnName(const ::rtl::OUString & rColumn Reference<XPropertySet> xColumn = findColumn( rColumnName, rTableRange, false ); if ( xColumn.is() ) m_aOrderColumns->get().push_back(new OOrderColumn(xColumn,isCaseSensitive(),bAscending)); - else + else { sal_Int32 nId = rColumnName.toInt32(); if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->get().size()) ) @@ -1934,7 +1934,7 @@ void OSQLParseTreeIterator::setGroupByColumnName(const ::rtl::OUString & rColumn Reference<XPropertySet> xColumn = findColumn( rColumnName, rTableRange, false ); if ( xColumn.is() ) m_aGroupColumns->get().push_back(new OParseColumn(xColumn,isCaseSensitive())); - else + else { sal_Int32 nId = rColumnName.toInt32(); if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->get().size()) ) @@ -1954,7 +1954,7 @@ void OSQLParseTreeIterator::setGroupByColumnName(const ::rtl::OUString & rColumn const OSQLParseNode* OSQLParseTreeIterator::getWhereTree() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getWhereTree" ); - + if (!m_pParseTree) return NULL; @@ -1986,7 +1986,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getWhereTree() const const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::getOrderTree" ); - + if (!m_pParseTree || getStatementType() != SQL_STATEMENT_SELECT) return NULL; @@ -2027,7 +2027,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getGroupByTree() const if(pGroupClause->count() != 3) pGroupClause = NULL; return pGroupClause; -} +} //----------------------------------------------------------------------------- const OSQLParseNode* OSQLParseTreeIterator::getHavingTree() const { @@ -2050,7 +2050,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getHavingTree() const return pHavingClause; } // ----------------------------------------------------------------------------- -sal_Bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) const +sal_Bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::isTableNode" ); return _pTableNode && (SQL_ISRULE(_pTableNode,catalog_name) || @@ -2100,14 +2100,14 @@ Reference< XPropertySet > OSQLParseTreeIterator::findColumn( const ::rtl::OUStri Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _rTables,const ::rtl::OUString & rColumnName, const ::rtl::OUString & rTableRange) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::findColumn" ); - Reference< XPropertySet > xColumn; + Reference< XPropertySet > xColumn; if ( rTableRange.getLength() ) { ConstOSQLTablesIterator aFind = _rTables.find(rTableRange); - if ( aFind != _rTables.end() - && aFind->second.is() - && aFind->second->getColumns().is() + if ( aFind != _rTables.end() + && aFind->second.is() + && aFind->second->getColumns().is() && aFind->second->getColumns()->hasByName(rColumnName) ) aFind->second->getColumns()->getByName(rColumnName) >>= xColumn; } @@ -2172,7 +2172,7 @@ sal_Int32 OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNo if ( SQL_ISRULE(_pNode,length_exp) ) { _pNode->getChild(0)->getChild(0)->parseNodeToStr(sFunctionName, m_pImpl->m_xConnection, NULL, sal_False, sal_False ); - nType = ::connectivity::OSQLParser::getFunctionReturnType( sFunctionName, &m_rParser.getContext() ); + nType = ::connectivity::OSQLParser::getFunctionReturnType( sFunctionName, &m_rParser.getContext() ); } else if ( SQL_ISRULE(_pNode,num_value_exp) || SQL_ISRULE(_pNode,term) || SQL_ISRULE(_pNode,factor) ) { @@ -2225,9 +2225,9 @@ sal_Int32 OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNo { nType = getFunctionReturnType(pValueExp->getChild(1)); } - else if ( SQL_ISRULE(pValueExp,concatenation) - || SQL_ISRULE(pValueExp,char_factor) - || SQL_ISRULE(pValueExp,bit_value_fct) + else if ( SQL_ISRULE(pValueExp,concatenation) + || SQL_ISRULE(pValueExp,char_factor) + || SQL_ISRULE(pValueExp,bit_value_fct) || SQL_ISRULE(pValueExp,char_value_fct) || SQL_ISRULE(pValueExp,char_substring_fct) || SQL_ISRULE(pValueExp,fold) @@ -2240,9 +2240,9 @@ sal_Int32 OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNo nType = DataType::DOUBLE; } else - nType = ::connectivity::OSQLParser::getFunctionReturnType( sFunctionName, &m_rParser.getContext() ); + nType = ::connectivity::OSQLParser::getFunctionReturnType( sFunctionName, &m_rParser.getContext() ); } - + return nType; } diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index fa47b2d1827f..b27aa289cbb9 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.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 @@ -34,7 +34,7 @@ #include <connectivity/sqlnode.hxx> #include <connectivity/sqlerror.hxx> #include <internalnode.hxx> -#define YYBISON 1 +#define YYBISON 1 #ifndef BISON_INCLUDED #define BISON_INCLUDED #include <sqlbison.hxx> @@ -202,7 +202,7 @@ SQLParseNodeParameter::~SQLParseNodeParameter() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::convertDateString" ); Date aDate = DBTypeConversion::toDate(rString); Reference< XNumberFormatsSupplier > xSupplier(rParam.xFormatter->getNumberFormatsSupplier()); - Reference< XNumberFormatTypes > xTypes(xSupplier->getNumberFormats(), UNO_QUERY); + Reference< XNumberFormatTypes > xTypes(xSupplier->getNumberFormats(), UNO_QUERY); double fDate = DBTypeConversion::toDouble(aDate,DBTypeConversion::getNULLDate(xSupplier)); sal_Int32 nKey = xTypes->getStandardIndex(rParam.rLocale) + 36; // XXX hack @@ -389,13 +389,13 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, { if(rString.getLength()) rString.appendAscii(" "); - if (nCount == 1) // ? + if (nCount == 1) // ? m_aChildren[0]->impl_parseNodeToString_throw( rString, rParam ); - else if (nCount == 2) // :Name + else if (nCount == 2) // :Name { m_aChildren[0]->impl_parseNodeToString_throw( rString, rParam ); rString.append(m_aChildren[1]->m_aNodeValue); - } // [Name] + } // [Name] else { m_aChildren[0]->impl_parseNodeToString_throw( rString, rParam ); @@ -445,11 +445,11 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, { // Funktionsname nicht quoten SQLParseNodeParameter aNewParam(rParam); - aNewParam.bQuote = ( SQL_ISRULE(this,length_exp) || SQL_ISRULE(this,char_value_fct) ); + aNewParam.bQuote = ( SQL_ISRULE(this,length_exp) || SQL_ISRULE(this,char_value_fct) ); m_aChildren[0]->impl_parseNodeToString_throw( rString, aNewParam ); aNewParam.bQuote = rParam.bQuote; - //aNewParam.bPredicate = sal_False; // disable [ ] around names // look at i73215 + //aNewParam.bPredicate = sal_False; // disable [ ] around names // look at i73215 ::rtl::OUStringBuffer aStringPara; for (sal_uInt32 i=1; i<nCount; i++) { @@ -459,7 +459,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, pSubTree->impl_parseNodeToString_throw( aStringPara, aNewParam ); // bei den CommaListen zwischen alle Subtrees Commas setzen - if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i < (nCount - 1))) + if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i < (nCount - 1))) aStringPara.appendAscii(","); } else @@ -512,10 +512,10 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, if(pSubTree->count()) { const OSQLParseNode* pCol = pSubTree->m_aChildren[pSubTree->count()-1]; - if ( ( SQL_ISRULE(pCol,column_val) - && pCol->getChild(0)->getTokenValue().equalsIgnoreAsciiCase(aFieldName) + if ( ( SQL_ISRULE(pCol,column_val) + && pCol->getChild(0)->getTokenValue().equalsIgnoreAsciiCase(aFieldName) ) - || pCol->getTokenValue().equalsIgnoreAsciiCase(aFieldName) + || pCol->getTokenValue().equalsIgnoreAsciiCase(aFieldName) ) bFilter = sal_True; } @@ -543,7 +543,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, i++; // bei den CommaListen zwischen alle Subtrees Commas setzen - if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i != m_aChildren.end())) + if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i != m_aChildren.end())) rString.appendAscii(","); } } @@ -553,7 +553,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, i++; // bei den CommaListen zwischen alle Subtrees Commas setzen - if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i != m_aChildren.end())) + if ((m_eNodeType == SQL_NODE_COMMALISTRULE) && (i != m_aChildren.end())) { if (SQL_ISRULE(this,value_exp_commalist) && rParam.bPredicate) rString.appendAscii(";"); @@ -669,7 +669,7 @@ void OSQLParseNode::impl_parseTableRangeNodeToString_throw(::rtl::OUStringBuffer { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseNode::impl_parseTableRangeNodeToString_throw" ); OSL_PRECOND( ( count() == 2 ) || ( count() == 3 ) || ( count() == 5 ) ,"Illegal count"); - + // rString += ::rtl::OUString::createFromAscii(" "); ::std::for_each(m_aChildren.begin(),m_aChildren.end(), boost::bind( &OSQLParseNode::impl_parseNodeToString_throw, _1, boost::ref( rString ), boost::cref( rParam ) )); @@ -1147,8 +1147,8 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const : // reset the parser - m_xField = xField; - m_xFormatter = xFormatter; + m_xField = xField; + m_xFormatter = xFormatter; if (m_xField.is()) { @@ -1247,7 +1247,7 @@ OSQLParseNode* OSQLParser::predicateTree(::rtl::OUString& rErrorMessage, const : s_pScanner->prepareScan(rStatement, m_pContext, sal_True); SQLyylval.pParseNode = NULL; - // SQLyypvt = NULL; + // SQLyypvt = NULL; m_pParseTree = NULL; m_sErrorMessage= ::rtl::OUString(); @@ -2514,7 +2514,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode rString.append(m_aNodeValue); rString.appendAscii("#"); break; - + case SQL_NODE_INTNUM: case SQL_NODE_APPROXNUM: { @@ -2774,7 +2774,7 @@ OSQLParseNode::Rule OSQLParseNode::getKnownRuleID() const { const OSQLParseNode* pNode = _pTableRef->getChild(nCount - (nCount == 2 ? 1 : 2)); OSL_ENSURE(pNode && (pNode->getKnownRuleID() == OSQLParseNode::table_primary_as_range_column - || pNode->getKnownRuleID() == OSQLParseNode::range_variable) + || pNode->getKnownRuleID() == OSQLParseNode::range_variable) ,"SQL grammar changed!"); if ( !pNode->isLeaf() ) sTableRange = pNode->getChild(1)->getTokenValue(); @@ -2791,14 +2791,14 @@ OSQLParseNodesContainer::~OSQLParseNodesContainer() { } // ----------------------------------------------------------------------------- -void OSQLParseNodesContainer::push_back(OSQLParseNode* _pNode) -{ +void OSQLParseNodesContainer::push_back(OSQLParseNode* _pNode) +{ ::osl::MutexGuard aGuard(m_aMutex); - m_aNodes.push_back(_pNode); + m_aNodes.push_back(_pNode); } // ----------------------------------------------------------------------------- -void OSQLParseNodesContainer::erase(OSQLParseNode* _pNode) -{ +void OSQLParseNodesContainer::erase(OSQLParseNode* _pNode) +{ ::osl::MutexGuard aGuard(m_aMutex); if ( !m_aNodes.empty() ) { @@ -2808,15 +2808,15 @@ void OSQLParseNodesContainer::erase(OSQLParseNode* _pNode) } } // ----------------------------------------------------------------------------- -bool OSQLParseNodesContainer::empty() const -{ - return m_aNodes.empty(); +bool OSQLParseNodesContainer::empty() const +{ + return m_aNodes.empty(); } // ----------------------------------------------------------------------------- -void OSQLParseNodesContainer::clear() -{ - ::osl::MutexGuard aGuard(m_aMutex); - m_aNodes.clear(); +void OSQLParseNodesContainer::clear() +{ + ::osl::MutexGuard aGuard(m_aMutex); + m_aNodes.clear(); } // ----------------------------------------------------------------------------- void OSQLParseNodesContainer::clearAndDelete() diff --git a/connectivity/source/parse/wrap_sqlbison.cxx b/connectivity/source/parse/wrap_sqlbison.cxx index e58391867233..932f74fa86c1 100644 --- a/connectivity/source/parse/wrap_sqlbison.cxx +++ b/connectivity/source/parse/wrap_sqlbison.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/source/parse/wrap_sqlflex.cxx b/connectivity/source/parse/wrap_sqlflex.cxx index a423977f61d3..31007e1fce92 100644 --- a/connectivity/source/parse/wrap_sqlflex.cxx +++ b/connectivity/source/parse/wrap_sqlflex.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/source/resource/conn_error_message.src b/connectivity/source/resource/conn_error_message.src index 7a5267f33058..ed1211d897e7 100644 --- a/connectivity/source/resource/conn_error_message.src +++ b/connectivity/source/resource/conn_error_message.src @@ -1,7 +1,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/source/resource/conn_log_res.src b/connectivity/source/resource/conn_log_res.src index ea5bb9d00072..5c380c880ec8 100644 --- a/connectivity/source/resource/conn_log_res.src +++ b/connectivity/source/resource/conn_log_res.src @@ -1,7 +1,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/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src index 87f69a4aabd0..faccf586a0f4 100644 --- a/connectivity/source/resource/conn_shared_res.src +++ b/connectivity/source/resource/conn_shared_res.src @@ -1,7 +1,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/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index 945b434e6669..a08e9bede45f 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.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 @@ -232,8 +232,8 @@ namespace connectivity ::std::list< ::std::pair<const sal_Char* , ::rtl::OUString > >::const_iterator aIter = _aStringToSubstitutes.begin(); ::std::list< ::std::pair<const sal_Char* , ::rtl::OUString > >::const_iterator aEnd = _aStringToSubstitutes.end(); for(;aIter != aEnd; ++aIter) - OSL_VERIFY( lcl_substitute( sString, aIter->first, aIter->second ) ); - + OSL_VERIFY( lcl_substitute( sString, aIter->first, aIter->second ) ); + return sString; } diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index f49c9e4fdbeb..4c5c687feb08 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.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 @@ -106,7 +106,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OCatalog_BASE::rBHelper.bDisposed); - + try { if(!m_pTables) @@ -130,7 +130,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getViews( ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OCatalog_BASE::rBHelper.bDisposed); - + try { if(!m_pViews) @@ -154,7 +154,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getUsers( ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OCatalog_BASE::rBHelper.bDisposed); - + try { if(!m_pUsers) @@ -178,7 +178,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getGroups( ) throw(RuntimeException { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OCatalog_BASE::rBHelper.bDisposed); - + try { if(!m_pGroups) @@ -205,7 +205,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getGroups( ) throw(RuntimeException ::rtl::OUString sSchema = _xRow->getString(2); if ( _xRow->wasNull() ) sSchema = ::rtl::OUString(); - ::rtl::OUString sTable = _xRow->getString(3); + ::rtl::OUString sTable = _xRow->getString(3); if ( _xRow->wasNull() ) sTable = ::rtl::OUString(); diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 61ec574386e0..29db100278b4 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.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 @@ -62,12 +62,12 @@ namespace typedef typename ObjectMap::iterator ObjectIter; typedef typename ObjectMap::value_type ObjectEntry; - // private: + // private: // this combination of map and vector is used to have a fast name and index access - ::std::vector< ObjectIter > m_aElements; // hold the iterators which point to map - ObjectMap m_aNameMap; // hold the elements and a name + ::std::vector< ObjectIter > m_aElements; // hold the iterators which point to map + ObjectMap m_aNameMap; // hold the elements and a name public: - OHardRefMap(sal_Bool _bCase) + OHardRefMap(sal_Bool _bCase) : m_aNameMap(_bCase ? true : false) { } @@ -125,7 +125,7 @@ namespace { OSL_ENSURE(!m_aNameMap.size(),"OCollection::reFill: collection isn't empty"); m_aElements.reserve(_rVector.size()); - + for(TStringVector::const_iterator i=_rVector.begin(); i != _rVector.end();++i) m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), ObjectEntry(*i,ObjectType()))); } @@ -176,10 +176,10 @@ namespace Reference<XComponent> xComp(m_aElements[_nIndex]->second.get(),UNO_QUERY); ::comphelper::disposeComponent(xComp); m_aElements[_nIndex]->second = T(); - + ::rtl::OUString sName = m_aElements[_nIndex]->first; m_aElements.erase(m_aElements.begin()+_nIndex); - m_aNameMap.erase(sName); + m_aNameMap.erase(sName); } // ----------------------------------------------------------------------------- virtual void disposeElements() @@ -194,7 +194,7 @@ namespace } } m_aElements.clear(); - m_aNameMap.clear(); + m_aNameMap.clear(); } // ----------------------------------------------------------------------------- virtual sal_Int32 findColumn( const ::rtl::OUString& columnName ) @@ -227,9 +227,9 @@ namespace m_aElements[_nIndex]->second = _xObject; } // ----------------------------------------------------------------------------- - sal_Bool isCaseSensitive() const - { - return m_aNameMap.key_comp().isCaseSensitive(); + sal_Bool isCaseSensitive() const + { + return m_aNameMap.key_comp().isCaseSensitive(); } // ----------------------------------------------------------------------------- }; @@ -279,8 +279,8 @@ Sequence< Type > SAL_CALL OCollection::getTypes() throw (RuntimeException) if ( m_bUseIndexOnly ) { Sequence< Type > aTypes(OCollectionBase::getTypes()); - Type* pBegin = aTypes.getArray(); - Type* pEnd = pBegin + aTypes.getLength(); + Type* pBegin = aTypes.getArray(); + Type* pEnd = pBegin + aTypes.getLength(); ::std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); @@ -311,7 +311,7 @@ void OCollection::disposing(void) m_aRefreshListeners.disposeAndClear(EventObject(static_cast<XTypeProvider*>(this))); ::osl::MutexGuard aGuard(m_rMutex); - + disposeElements(); m_pElements->swap(); @@ -352,8 +352,8 @@ Sequence< ::rtl::OUString > SAL_CALL OCollection::getElementNames( ) throw(Runt void SAL_CALL OCollection::refresh( ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - - disposeElements(); + + disposeElements(); impl_refresh(); EventObject aEvt(static_cast<XTypeProvider*>(this)); @@ -529,7 +529,7 @@ void SAL_CALL OCollection::removeRefreshListener( const Reference< XRefreshListe void OCollection::insertElement(const ::rtl::OUString& _sElementName,const ObjectType& _xElement) { OSL_ENSURE(!m_pElements->exists(_sElementName),"Element already exists"); - if ( !m_pElements->exists(_sElementName) ) + if ( !m_pElements->exists(_sElementName) ) m_pElements->insert(_sElementName,_xElement); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx index 2d92e22e9878..0c5f25a6af17 100644 --- a/connectivity/source/sdbcx/VColumn.cxx +++ b/connectivity/source/sdbcx/VColumn.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 @@ -87,18 +87,18 @@ OColumn::OColumn(sal_Bool _bCase) construct(); } // ------------------------------------------------------------------------- -OColumn::OColumn( const ::rtl::OUString& _Name, +OColumn::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) :OColumnDescriptor_BASE(m_aMutex) ,ODescriptor(OColumnDescriptor_BASE::rBHelper,_bCase) ,m_TypeName(_TypeName) @@ -168,16 +168,16 @@ void OColumn::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT), PROPERTY_ID_ISAUTOINCREMENT, nAttrib,&m_IsAutoIncrement, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISROWVERSION), PROPERTY_ID_ISROWVERSION, nAttrib,&m_IsRowVersion, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY), PROPERTY_ID_ISCURRENCY, nAttrib,&m_IsCurrency, ::getBooleanCppuType()); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT), PROPERTY_ID_ISAUTOINCREMENT, nAttrib,&m_IsAutoIncrement, ::getBooleanCppuType()); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISROWVERSION), PROPERTY_ID_ISROWVERSION, nAttrib,&m_IsRowVersion, ::getBooleanCppuType()); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY), PROPERTY_ID_ISCURRENCY, nAttrib,&m_IsCurrency, ::getBooleanCppuType()); } // ------------------------------------------------------------------------- void OColumn::disposing(void) @@ -195,7 +195,7 @@ Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor( ) throw(Runti checkDisposed(OColumnDescriptor_BASE::rBHelper.bDisposed); - OColumn* pNewColumn = new OColumn( m_Name, + OColumn* pNewColumn = new OColumn( m_Name, m_TypeName, m_DefaultValue, m_Description, diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index 90a83e6170e8..4f4b29bfaee1 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.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 @@ -143,7 +143,7 @@ namespace connectivity // ----------------------------------------------------------------------------- Sequence< Type > SAL_CALL ODescriptor::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 ), ::getCppuType( (const Reference< XUnoTunnel > *)0 )); diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index 5c5bfb326ffd..6ed9588ca98b 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.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 @@ -49,13 +49,13 @@ using namespace ::com::sun::star::beans; IMPLEMENT_SERVICE_INFO(OGroup,"com.sun.star.sdbcx.VGroup","com.sun.star.sdbcx.Group"); // ------------------------------------------------------------------------- -OGroup::OGroup(sal_Bool _bCase) : OGroup_BASE(m_aMutex) - , ODescriptor(OGroup_BASE::rBHelper,_bCase) - , m_pUsers(NULL) +OGroup::OGroup(sal_Bool _bCase) : OGroup_BASE(m_aMutex) + , ODescriptor(OGroup_BASE::rBHelper,_bCase) + , m_pUsers(NULL) { } // ------------------------------------------------------------------------- -OGroup::OGroup(const ::rtl::OUString& _Name,sal_Bool _bCase) : OGroup_BASE(m_aMutex) +OGroup::OGroup(const ::rtl::OUString& _Name,sal_Bool _bCase) : OGroup_BASE(m_aMutex) ,ODescriptor(OGroup_BASE::rBHelper,_bCase) ,m_pUsers(NULL) { diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index e01f1d1e438a..e38fb9d10c5b 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.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 @@ -78,8 +78,8 @@ sal_Bool SAL_CALL OIndex::supportsService( const ::rtl::OUString& _rServiceName return pSupported != pEnd; } // ------------------------------------------------------------------------- -OIndex::OIndex(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) - , ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True) +OIndex::OIndex(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) + , ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True) ,m_IsUnique(sal_False) ,m_IsPrimaryKeyIndex(sal_False) ,m_IsClustered(sal_False) @@ -87,12 +87,12 @@ OIndex::OIndex(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) { } // ------------------------------------------------------------------------- -OIndex::OIndex( const ::rtl::OUString& _Name, +OIndex::OIndex( const ::rtl::OUString& _Name, const ::rtl::OUString& _Catalog, sal_Bool _isUnique, sal_Bool _isPrimaryKeyIndex, sal_Bool _isClustered, - sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) + sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase) ,m_Catalog(_Catalog) ,m_IsUnique(_isUnique) @@ -144,10 +144,10 @@ void OIndex::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE), PROPERTY_ID_ISUNIQUE, nAttrib,&m_IsUnique, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISPRIMARYKEYINDEX),PROPERTY_ID_ISPRIMARYKEYINDEX, nAttrib,&m_IsPrimaryKeyIndex, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, ::getBooleanCppuType()); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE), PROPERTY_ID_ISUNIQUE, nAttrib,&m_IsUnique, ::getBooleanCppuType()); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISPRIMARYKEYINDEX),PROPERTY_ID_ISPRIMARYKEYINDEX, nAttrib,&m_IsPrimaryKeyIndex, ::getBooleanCppuType()); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, ::getBooleanCppuType()); } // ------------------------------------------------------------------------- void OIndex::disposing(void) @@ -167,7 +167,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OIndex::getColumn try { - if ( !m_pColumns ) + if ( !m_pColumns ) refreshColumns(); } catch( const RuntimeException& ) diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx index 4e82cc8a082c..3abb96411a8f 100644 --- a/connectivity/source/sdbcx/VIndexColumn.cxx +++ b/connectivity/source/sdbcx/VIndexColumn.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 @@ -65,24 +65,24 @@ sal_Bool SAL_CALL OIndexColumn::supportsService( const ::rtl::OUString& _rServic return pSupported != pEnd; } // ----------------------------------------------------------------------------- -OIndexColumn::OIndexColumn(sal_Bool _bCase) : OColumn(_bCase), m_IsAscending(sal_True) +OIndexColumn::OIndexColumn(sal_Bool _bCase) : OColumn(_bCase), m_IsAscending(sal_True) { construct(); } // ------------------------------------------------------------------------- -OIndexColumn::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 +OIndexColumn::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 ) : OColumn(_Name, _TypeName, _DefaultValue, @@ -95,7 +95,7 @@ OIndexColumn::OIndexColumn( sal_Bool _IsAscending, _IsRowVersion, _IsCurrency, _bCase) - , m_IsAscending(_IsAscending) + , m_IsAscending(_IsAscending) { construct(); } @@ -113,7 +113,7 @@ OIndexColumn::OIndexColumn( sal_Bool _IsAscending, void OIndexColumn::construct() { sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType()); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType()); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index 5efa7693d26f..4b27b9a396ea 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.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 @@ -77,10 +77,10 @@ sal_Bool SAL_CALL OKey::supportsService( const ::rtl::OUString& _rServiceName ) return pSupported != pEnd; } // ------------------------------------------------------------------------- -OKey::OKey(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) - , ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True) +OKey::OKey(sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) + , ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True) , m_aProps(new KeyProperties()) - , m_pColumns(NULL) + , m_pColumns(NULL) { } // ------------------------------------------------------------------------- @@ -92,20 +92,20 @@ OKey::OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _ { m_Name = _Name; } -//OKey::OKey( const ::rtl::OUString& _Name, -// const ::rtl::OUString& _ReferencedTable, -// sal_Int32 _Type, -// sal_Int32 _UpdateRule, -// sal_Int32 _DeleteRule, -// sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) -// ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase) -// ,m_ReferencedTable(_ReferencedTable) -// ,m_Type(_Type) -// ,m_UpdateRule(_UpdateRule) -// ,m_DeleteRule(_DeleteRule) +//OKey::OKey( const ::rtl::OUString& _Name, +// const ::rtl::OUString& _ReferencedTable, +// sal_Int32 _Type, +// sal_Int32 _UpdateRule, +// sal_Int32 _DeleteRule, +// sal_Bool _bCase) : ODescriptor_BASE(m_aMutex) +// ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase) +// ,m_ReferencedTable(_ReferencedTable) +// ,m_Type(_Type) +// ,m_UpdateRule(_UpdateRule) +// ,m_DeleteRule(_DeleteRule) // ,m_pColumns(NULL) //{ -// m_Name = _Name; +// m_Name = _Name; //} // ------------------------------------------------------------------------- OKey::~OKey( ) @@ -141,10 +141,10 @@ void OKey::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); } // ------------------------------------------------------------------------- void SAL_CALL OKey::disposing() diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx index 072b3a188661..06cad1a1bed6 100644 --- a/connectivity/source/sdbcx/VKeyColumn.cxx +++ b/connectivity/source/sdbcx/VKeyColumn.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 @@ -71,18 +71,18 @@ OKeyColumn::OKeyColumn(sal_Bool _bCase) : OColumn(_bCase) construct(); } // ------------------------------------------------------------------------- -OKeyColumn::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 +OKeyColumn::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 ) : OColumn(_Name, _TypeName, _DefaultValue, @@ -95,7 +95,7 @@ OKeyColumn::OKeyColumn( const ::rtl::OUString& _ReferencedColumn, _IsRowVersion, _IsCurrency, _bCase) - , m_ReferencedColumn(_ReferencedColumn) + , m_ReferencedColumn(_ReferencedColumn) { construct(); } @@ -117,7 +117,7 @@ OKeyColumn::~OKeyColumn() void OKeyColumn::construct() { sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index 80f37ddc440b..237dedc3470d 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.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 @@ -81,7 +81,7 @@ sal_Bool SAL_CALL OTable::supportsService( const ::rtl::OUString& _rServiceName return pSupported != pEnd; } // ------------------------------------------------------------------------- -OTable::OTable(OCollection* _pTables, +OTable::OTable(OCollection* _pTables, sal_Bool _bCase) : OTableDescriptor_BASE(m_aMutex) ,ODescriptor(OTableDescriptor_BASE::rBHelper,_bCase,sal_True) @@ -92,11 +92,11 @@ OTable::OTable(OCollection* _pTables, { } // ----------------------------------------------------------------------------- -OTable::OTable( OCollection* _pTables, +OTable::OTable( OCollection* _pTables, sal_Bool _bCase, - const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, + const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString& _Description,const ::rtl::OUString& _SchemaName, - const ::rtl::OUString& _CatalogName) : OTableDescriptor_BASE(m_aMutex) + const ::rtl::OUString& _CatalogName) : OTableDescriptor_BASE(m_aMutex) ,ODescriptor(OTableDescriptor_BASE::rBHelper,_bCase) ,m_CatalogName(_CatalogName) ,m_SchemaName(_SchemaName) @@ -123,10 +123,10 @@ void OTable::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } // ----------------------------------------------------------------------------- void SAL_CALL OTable::acquire() throw() diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index 1b4a9b132c90..318bf3309737 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.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 @@ -56,7 +56,7 @@ OUser::OUser(sal_Bool _bCase) : OUser_BASE(m_aMutex) { } // ------------------------------------------------------------------------- -OUser::OUser(const ::rtl::OUString& _Name,sal_Bool _bCase) : OUser_BASE(m_aMutex) +OUser::OUser(const ::rtl::OUString& _Name,sal_Bool _bCase) : OUser_BASE(m_aMutex) ,ODescriptor(OUser_BASE::rBHelper,_bCase) ,m_pGroups(NULL) { diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index 2f92e2fb55b4..e9ffec7c9225 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.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 @@ -80,10 +80,10 @@ void OView::construct() sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); } // ------------------------------------------------------------------------- void OView::disposing(void) diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx index 7cd445072cae..c428fbb9db89 100644 --- a/connectivity/source/simpledbt/charset_s.cxx +++ b/connectivity/source/simpledbt/charset_s.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 @@ -69,7 +69,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx index aaafb15fdcc8..ee243f116a52 100644 --- a/connectivity/source/simpledbt/charset_s.hxx +++ b/connectivity/source/simpledbt/charset_s.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,13 +46,13 @@ namespace connectivity ,public ORefBase { protected: - ::dbtools::OCharsetMap m_aCharsetInfo; + ::dbtools::OCharsetMap m_aCharsetInfo; public: ODataAccessCharSet() { } // IDataAccessCharSet - sal_Int32 getSupportedTextEncodings( + sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& /* [out] */ _rEncs ) const; @@ -62,7 +62,7 @@ namespace connectivity }; //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_DBTOOLS_CHARSET_S_HXX diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx index d3e8f52afb3a..bbf11f8dd053 100644 --- a/connectivity/source/simpledbt/dbtfactory.cxx +++ b/connectivity/source/simpledbt/dbtfactory.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 @@ -109,7 +109,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx index f08ed57b4daf..1f49192a5267 100644 --- a/connectivity/source/simpledbt/dbtfactory.hxx +++ b/connectivity/source/simpledbt/dbtfactory.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 @@ -45,14 +45,14 @@ namespace connectivity ,public ORefBase { protected: - ::rtl::Reference< simple::IDataAccessTypeConversion > m_xTypeConversionHelper; - ::rtl::Reference< simple::IDataAccessTools > m_xToolsHelper; + ::rtl::Reference< simple::IDataAccessTypeConversion > m_xTypeConversionHelper; + ::rtl::Reference< simple::IDataAccessTools > m_xToolsHelper; public: ODataAccessToolsFactory(); // IDataAccessToolsFactory - virtual ::rtl::Reference< simple::ISQLParser > createSQLParser( + virtual ::rtl::Reference< simple::ISQLParser > createSQLParser( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceFactory, const IParseContext* _pContext ) const; @@ -75,7 +75,7 @@ namespace connectivity }; //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_DBTOOLS_DBTFACTORY_HXX diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx index 78e01e5e3cd4..ba73172ad1fb 100644 --- a/connectivity/source/simpledbt/parsenode_s.cxx +++ b/connectivity/source/simpledbt/parsenode_s.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 @@ -88,7 +88,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx index 7459d1d0ceab..a72244a8d5df 100644 --- a/connectivity/source/simpledbt/parsenode_s.hxx +++ b/connectivity/source/simpledbt/parsenode_s.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,15 +46,15 @@ namespace connectivity ,public ORefBase { protected: - const OSQLParseNode* m_pFullNode; - sal_Bool m_bOwner; + const OSQLParseNode* m_pFullNode; + sal_Bool m_bOwner; public: OSimpleParseNode(const OSQLParseNode* _pNode, sal_Bool _bTakeOwnership = sal_True); ~OSimpleParseNode(); // ISQLParseNode - virtual void parseNodeToStr(::rtl::OUString& _rString, + virtual void parseNodeToStr(::rtl::OUString& _rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const IParseContext* _pContext ) const; @@ -74,7 +74,7 @@ namespace connectivity }; //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_PARSENODE_SIMPLE_HXX diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx index 498976a19f6d..f722e8d775d0 100644 --- a/connectivity/source/simpledbt/parser_s.cxx +++ b/connectivity/source/simpledbt/parser_s.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 @@ -81,7 +81,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx index 1658f7ae0fce..d5edd28ddfa8 100644 --- a/connectivity/source/simpledbt/parser_s.hxx +++ b/connectivity/source/simpledbt/parser_s.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,7 +46,7 @@ namespace connectivity ,public ORefBase { protected: - OSQLParser m_aFullParser; + OSQLParser m_aFullParser; public: OSimpleSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceFactory,const IParseContext* _pContext); @@ -67,7 +67,7 @@ namespace connectivity }; //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_DBTOOLS_PARSER_SIMPLE_HXX diff --git a/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx index d4788bbe6a3e..6bb2a5bae250 100644 --- a/connectivity/source/simpledbt/refbase.cxx +++ b/connectivity/source/simpledbt/refbase.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 @@ -60,7 +60,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/refbase.hxx b/connectivity/source/simpledbt/refbase.hxx index 11d2a0d54966..41b937c5a551 100644 --- a/connectivity/source/simpledbt/refbase.hxx +++ b/connectivity/source/simpledbt/refbase.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 class ORefBase : public ::rtl::IReference { protected: - oslInterlockedCount m_refCount; + oslInterlockedCount m_refCount; protected: ORefBase() : m_refCount(0) { } @@ -54,7 +54,7 @@ namespace connectivity }; //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_DBTOOLS_REFBASE_HXX diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx index 56b211be249e..d5e2fd5fb9e4 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.cxx +++ b/connectivity/source/simpledbt/staticdbtools_s.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 @@ -109,7 +109,7 @@ namespace connectivity // ------------------------------------------------ Reference< XConnection> ODataAccessStaticTools::getRowSetConnection( - const Reference< XRowSet>& _rxRowSet) + const Reference< XRowSet>& _rxRowSet) const SAL_THROW ( (RuntimeException) ) { return ::dbtools::getConnection(_rxRowSet); @@ -208,7 +208,7 @@ namespace connectivity } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx index 497893b7cd63..ea2a0e494d8f 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.hxx +++ b/connectivity/source/simpledbt/staticdbtools_s.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 @@ -94,7 +94,7 @@ namespace connectivity // ------------------------------------------------ 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) ); // ------------------------------------------------ @@ -153,19 +153,19 @@ namespace connectivity // ------------------------------------------------ /** 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; // ------------------------------------------------ /** 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; // ------------------------------------------------ /** 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; @@ -177,7 +177,7 @@ namespace connectivity const ::rtl::OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ); + ) SAL_THROW( ( ) ); // ------------------------------------------------ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > @@ -186,7 +186,7 @@ namespace connectivity const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ); + ) SAL_THROW( ( ) ); // ------------------------------------------------ virtual bool isEmbeddedInDatabase( @@ -201,7 +201,7 @@ namespace connectivity }; //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_STATIC_DBTOOLS_SIMPLE_HXX diff --git a/connectivity/workben/TT/StartTest.java b/connectivity/workben/TT/StartTest.java index 305f1fc4da9a..827e85d2f2ab 100644 --- a/connectivity/workben/TT/StartTest.java +++ b/connectivity/workben/TT/StartTest.java @@ -1,7 +1,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 @@ -31,7 +31,7 @@ import java.io.*; import workben.odbc.*; import com.sun.star.comp.servicemanager.ServiceManager; -// import java.io.IOException; +// import java.io.IOException; //import com.sun.star.beans.PropertyValue; //import com.sun.star.beans.PropertyState; @@ -41,10 +41,10 @@ import com.sun.star.bridge.XBridge; // import com.sun.star.comp.bootstrap.Bootstrap; -// import com.sun.star.io.XInputStream; -// import com.sun.star.io.XOutputStream; +// import com.sun.star.io.XInputStream; +// import com.sun.star.io.XOutputStream; -// import com.sun.star.lang.XComponent; +// import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.lang.XServiceInfo; @@ -54,11 +54,11 @@ import com.sun.star.uno.XInterface; import com.sun.star.uno.XNamingService; import com.sun.star.sdbc.*; -// import com.sun.star.sdbc.XConnection; -// import com.sun.star.uno.Enum; +// import com.sun.star.sdbc.XConnection; +// import com.sun.star.uno.Enum; -// import com.sun.star.lib.uno.typeinfo.ParameterTypeInfo; -// import com.sun.star.lib.uno.typeinfo.TypeInfo; +// import com.sun.star.lib.uno.typeinfo.ParameterTypeInfo; +// import com.sun.star.lib.uno.typeinfo.TypeInfo; public class StartTest { @@ -196,7 +196,7 @@ public class StartTest XConnector xConnector = (XConnector)smgr.createInstance("com.sun.star.connection.Connector"); if(xConnector == null) System.err.println("no connector!"); - XConnection xConn = xConnector.connect("socket,host=localhost,port=6001"); + XConnection xConn = xConnector.connect("socket,host=localhost,port=6001"); if(xConn == null) System.err.println("no XConnection!"); IBridge iBridge = UnoRuntime.getBridgeByName("java", null, "remote", null, new Object[]{"iiop", xConn, null}); diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx index 41c183040d7b..62b1239f99b0 100644 --- a/connectivity/workben/iniParser/main.cxx +++ b/connectivity/workben/iniParser/main.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 @@ -81,7 +81,7 @@ public: OUString curDirPth; OUString iniUrl; osl_getProcessWorkingDir( &curDirPth.pData ); - if (osl_getAbsoluteFileURL( curDirPth.pData, rIniName.pData, &iniUrl.pData )) + if (osl_getAbsoluteFileURL( curDirPth.pData, rIniName.pData, &iniUrl.pData )) throw ::com::sun::star::io::IOException(); diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx index 2bed1a8496f8..d97ede8eecc2 100644 --- a/connectivity/workben/little/main.cxx +++ b/connectivity/workben/little/main.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 @@ -61,11 +61,11 @@ void _cdecl main( int argc, char * argv[] ) #endif { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver> m_xDriver; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver> m_xDriver; try{ - Reference< ::com::sun::star::lang::XMultiServiceFactory > xFac = + Reference< ::com::sun::star::lang::XMultiServiceFactory > xFac = createRegistryServiceFactory(OUString::createFromAscii("g:\\office50\\program\\applicat.rdb"),OUString()); if(!xFac.is()) return; @@ -73,10 +73,10 @@ void _cdecl main( int argc, char * argv[] ) m_xDriver = Reference<XDriver>(xFac->createInstance(OUString::createFromAscii("com.sun.star.sdbc.driver.dbase.Driver")),UNO_QUERY); if(m_xDriver.is()) { - + Sequence<PropertyValue> aValue; - // aValue.getArray()[0] = PropertyValue( OUString::createFromAscii("user"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE); - // aValue.getArray()[1] = PropertyValue( OUString::createFromAscii("password"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE); + // aValue.getArray()[0] = PropertyValue( OUString::createFromAscii("user"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE); + // aValue.getArray()[1] = PropertyValue( OUString::createFromAscii("password"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE); // m_xConnection = m_xDriver->connect(OUString::createFromAscii("sdbc:dbase:g:\\"),aValue); if(m_xConnection.is()) diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index 22a062bfda97..3bf62a4e1237 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.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 { /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -68,39 +68,39 @@ namespace connectivity typedef sal_Int64 TVoidPtr; - typedef ::std::allocator< TVoidPtr > TVoidAlloc; - typedef ::std::vector<TVoidPtr> TVoidVector; + typedef ::std::allocator< TVoidPtr > TVoidAlloc; + typedef ::std::vector<TVoidPtr> TVoidVector; - class OResultSet : public comphelper::OBaseMutex, - public OResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + class OResultSet : public comphelper::OBaseMutex, + public OResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { protected: - TVoidVector m_aBindVector; - ::std::vector<sal_Int32> m_aLengthVector; - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime - ::std::vector< ORowSetValue> m_aRow; // only used when SQLGetData can't be called in any order - OStatement_Base* m_pStatement; - ::com::sun::star::uno::WeakReferenceHelper m_aStatement; + TVoidVector m_aBindVector; + ::std::vector<sal_Int32> m_aLengthVector; + ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime + ::std::vector< ORowSetValue> m_aRow; // only used when SQLGetData can't be called in any order + OStatement_Base* m_pStatement; + ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - rtl_TextEncoding m_nTextEncoding; - sal_Int32 m_nRowPos; - sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are - sal_Bool m_bWasNull; - sal_Bool m_bBOF; // before first record - sal_Bool m_bEOF; // after last record - sal_Bool m_bLastRecord; - sal_Bool m_bFreeHandle; - sal_Bool m_bInserting; - sal_Bool m_bFetchData; // true when SQLGetaData can be called in any order or when fetching data for m_aRow - - sal_Bool isBookmarkable() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + rtl_TextEncoding m_nTextEncoding; + sal_Int32 m_nRowPos; + sal_Int32 m_nLastColumnPos; // used for m_aRow just to know where we are + sal_Bool m_bWasNull; + sal_Bool m_bBOF; // before first record + sal_Bool m_bEOF; // after last record + sal_Bool m_bLastRecord; + sal_Bool m_bFreeHandle; + sal_Bool m_bInserting; + sal_Bool m_bFetchData; // true when SQLGetaData can be called in any order or when fetching data for m_aRow + + sal_Bool isBookmarkable() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::rtl::OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -110,7 +110,7 @@ namespace connectivity void allocBuffer(sal_Bool _bAllocRow); void releaseBuffer(); - + // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; @@ -137,9 +137,9 @@ namespace connectivity virtual ~OResultSet(); public: DECLARE_SERVICE_INFO(); - + OResultSet( OStatement_Base* pStmt); - + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() { diff --git a/connectivity/workben/testmoz/initUNO.cxx b/connectivity/workben/testmoz/initUNO.cxx index 952ac372626f..d6855776348d 100644 --- a/connectivity/workben/testmoz/initUNO.cxx +++ b/connectivity/workben/testmoz/initUNO.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/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index 390c11a0093e..a8263f9ee63a 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.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 @@ -168,7 +168,7 @@ static const char * const components[] = , "sax.uno" SAL_DLLEXTENSION , "stocservices.uno" SAL_DLLEXTENSION , SAL_MODULENAME( "fileacc" ) - , SAL_MODULENAME( "mcnttype" ) //Clipboard Ask Oliver Braun + , SAL_MODULENAME( "mcnttype" ) //Clipboard Ask Oliver Braun , "i18npool.uno" SAL_DLLEXTENSION // Reading of files in specific encodings like UTF-8 using // createUnoService( "com.sun.star.io.TextInputStream" ) and such @@ -281,7 +281,7 @@ Reference< XMultiServiceFactory > InitializeFac( void ) // set global factory setProcessServiceFactory( xSMgr ); -/* // Create simple ConfigManager +/* // Create simple ConfigManager Sequence< Any > aConfArgs(3); aConfArgs[0] <<= PropertyValue( OUString::createFromAscii("servertype"), 0, makeAny( OUString::createFromAscii("local") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); aConfArgs[1] <<= PropertyValue( OUString::createFromAscii("sourcepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE ); @@ -293,7 +293,7 @@ Reference< XMultiServiceFactory > InitializeFac( void ) // Create unconfigured Ucb: -/* Sequence< Any > aArgs(1); +/* Sequence< Any > aArgs(1); aArgs[1] = makeAny ( xConfProvider );*/ Sequence< Any > aArgs; ::ucb::ContentBroker::initialize( xSMgr, aArgs ); @@ -305,7 +305,7 @@ Reference< XMultiServiceFactory > InitializeFac( void ) xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True ); -/* Reference< XContentProvider > xPackageProvider +/* Reference< XContentProvider > xPackageProvider ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.PackageContentProvider" ) ), UNO_QUERY ); xUcb->registerContentProvider( xPackageProvider, OUString::createFromAscii( "vnd.sun.star.pkg" ), sal_True ); */ @@ -428,7 +428,7 @@ Reference<XResultSet> TestQuery(Reference< ::com::sun::star::sdbc::XConnection> Reference< ::com::sun::star::sdbc::XConnection> TestConnected (Reference< ::com::sun::star::sdbc::XDriver> &pDriver,sal_Int32 choice) { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> pConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> pConnection; printf("Begin Connect!\n"); OUString url; Sequence<PropertyValue> aValue; @@ -671,7 +671,7 @@ int _cdecl main( int argc, char * argv[] ) { Reference< XMultiServiceFactory > xMgr = InitializeFac(); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; try { Reference< ::com::sun::star::sdbc::XDriver> diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index f3a347043e9e..794a6779cf43 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.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 @@ -233,7 +233,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) { OSL_TRACE(": got statement\n"); OSL_TRACE(": excuteQuery() : START \n"); -// SELECT "First Name", "Display Name", "E-mail" FROM tablename +// SELECT "First Name", "Display Name", "E-mail" FROM tablename OUString sqlPrefix= OUString::createFromAscii("SELECT \"First Name\", \"Display Name\", \"E-mail\" FROM "); try { @@ -268,9 +268,9 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) } catch ( Exception &e ) { OSL_TRACE( "Exception caught : %s\n", OUtoCStr( e.Message) ); } -// catch (...) { +// catch (...) { // OSL_TRACE( "Non-UNO Exception caught\n" ); -// } +// } OSL_TRACE("excuteQuery() : END \n"); } else @@ -282,7 +282,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection) Reference< ::com::sun::star::sdbc::XConnection> TestConnected (Reference< ::com::sun::star::sdbc::XDriver> &pDriver) { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> pConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> pConnection; OSL_TRACE("Begin Connect!\n"); OUString url; Sequence<PropertyValue> aValue; @@ -359,7 +359,7 @@ int autoTest(Reference<XResultSet> &xRes) } void SAL_CALL mozThread(void*) { - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; try { Reference< ::com::sun::star::sdbc::XDriver> @@ -388,7 +388,7 @@ void SAL_CALL mozThread(void*) } catch ( Exception &e ) { OSL_TRACE( "Exception caught : %s\n", OUtoCStr( e.Message) ); } -// catch (...) { +// catch (...) { // OSL_TRACE( "Non-UNO Exception caught\n" ); // } } |