summaryrefslogtreecommitdiff
path: root/connectivity/source/inc/hsqldb
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/inc/hsqldb')
-rw-r--r--connectivity/source/inc/hsqldb/HCatalog.hxx74
-rw-r--r--connectivity/source/inc/hsqldb/HColumns.hxx72
-rw-r--r--connectivity/source/inc/hsqldb/HConnection.hxx160
-rw-r--r--connectivity/source/inc/hsqldb/HDriver.hxx147
-rwxr-xr-xconnectivity/source/inc/hsqldb/HStorageAccess.h98
-rw-r--r--connectivity/source/inc/hsqldb/HStorageAccess.hxx46
-rw-r--r--connectivity/source/inc/hsqldb/HStorageMap.hxx94
-rw-r--r--connectivity/source/inc/hsqldb/HTable.hxx130
-rw-r--r--connectivity/source/inc/hsqldb/HTables.hxx80
-rw-r--r--connectivity/source/inc/hsqldb/HTools.hxx68
-rw-r--r--connectivity/source/inc/hsqldb/HUser.hxx84
-rw-r--r--connectivity/source/inc/hsqldb/HUsers.hxx64
-rw-r--r--connectivity/source/inc/hsqldb/HView.hxx100
-rw-r--r--connectivity/source/inc/hsqldb/HViews.hxx65
-rwxr-xr-xconnectivity/source/inc/hsqldb/StorageFileAccess.h40
-rwxr-xr-xconnectivity/source/inc/hsqldb/StorageNativeInputStream.h73
16 files changed, 0 insertions, 1395 deletions
diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
deleted file mode 100644
index 71282008b6..0000000000
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CONNECTIVITY_HSQLDB_CATALOG_HXX
-#define CONNECTIVITY_HSQLDB_CATALOG_HXX
-
-#include "connectivity/sdbcx/VCatalog.hxx"
-#include "connectivity/StdTypeDefs.hxx"
-
-namespace connectivity
-{
- namespace hsqldb
- {
- // please don't name the class the same name as in an other namespaces
- // some compilers have problems with this task as I noticed on windows
- class OHCatalog : public connectivity::sdbcx::OCatalog
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
-
- /** calls XDatabaseMetaData::getTables.
- @param _sKindOfObject
- The type of tables to be fetched.
- @param _rNames
- The container for the names to be filled.
- */
- void refreshObjects(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames);
-
- public:
- // implementation of the pure virtual methods
- virtual void refreshTables();
- virtual void refreshViews() ;
- virtual void refreshGroups();
- 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 ::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);
- // ::cppu::OComponentHelper
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException);
- };
- }
-}
-#endif // CONNECTIVITY_HSQLDB_CATALOG_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
deleted file mode 100644
index 637ea8f2c2..0000000000
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CONNECTIVITY_HSQLDB_COLUMN_HXX
-#define CONNECTIVITY_HSQLDB_COLUMN_HXX
-#include "connectivity/TColumnsHelper.hxx"
-#include "connectivity/sdbcx/VColumn.hxx"
-
-namespace connectivity
-{
- namespace hsqldb
- {
- class OHSQLColumns : public OColumnsHelper
- {
- protected:
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
- public:
- OHSQLColumns( ::cppu::OWeakObject& _rParent
- ,sal_Bool _bCase
- ,::osl::Mutex& _rMutex
- ,const TStringVector &_rVector
- ,sal_Bool _bUseHardRef = sal_True
- );
- };
-
- class OHSQLColumn;
- typedef sdbcx::OColumn OHSQLColumn_BASE;
- typedef ::comphelper::OIdPropertyArrayUsageHelper<OHSQLColumn> OHSQLColumn_PROP;
-
- class OHSQLColumn : public OHSQLColumn_BASE,
- public OHSQLColumn_PROP
- {
- ::rtl::OUString m_sAutoIncrement;
- protected:
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const;
- virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
- public:
- OHSQLColumn(sal_Bool _bCase);
- virtual void construct();
-
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
- };
- }
-}
-#endif // CONNECTIVITY_HSQLDB_COLUMN_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
deleted file mode 100644
index 5c86cf9dee..0000000000
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CONNECTIVITY_HSQLDB_CONNECTION_HXX
-#define CONNECTIVITY_HSQLDB_CONNECTION_HXX
-
-#include "connectivity/ConnectionWrapper.hxx"
-/** === begin UNO includes === **/
-#include <com/sun/star/util/XFlushable.hpp>
-#include <com/sun/star/sdbc/XDriver.hpp>
-#ifndef __com_sun_star_sdb_application_XTableUIProvider_hpp__
-#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
-#endif
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-/** === end UNO includes === **/
-#include <cppuhelper/compbase2.hxx>
-#include <comphelper/uno3.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
-#include <memory>
-
-namespace connectivity
-{
- namespace hsqldb
- {
- class SAL_NO_VTABLE IMethodGuardAccess
- {
- public:
- virtual ::osl::Mutex& getMutex() const = 0;
- virtual void checkDisposed() const = 0;
- };
-
- //==========================================================================
- //= OHsqlConnection - wraps all methods to the real connection from the driver
- //= but when disposed it doesn't dispose the real connection
- //==========================================================================
- typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::util::XFlushable
- , ::com::sun::star::sdb::application::XTableUIProvider
- > OHsqlConnection_BASE;
-
- class OHsqlConnection :public ::comphelper::OBaseMutex
- ,public OHsqlConnection_BASE
- ,public OConnectionWrapper
- ,public IMethodGuardAccess
- {
- private:
- ::cppu::OInterfaceContainerHelper m_aFlushListeners;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > m_xDriver;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
- bool m_bIni;
- bool m_bReadOnly;
-
- protected:
- virtual void SAL_CALL disposing(void);
- virtual ~OHsqlConnection();
-
- public:
- OHsqlConnection(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > _rxDriver,
- 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()
- DECLARE_XINTERFACE( )
-
- // IMethodGuardAccess
- virtual ::osl::Mutex& getMutex() const;
- virtual void checkDisposed() const;
-
- // XFlushable
- virtual void SAL_CALL flush( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException);
-
- // XTableUIProvider
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const ::rtl::OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const ::rtl::OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
- private:
-
- /** retrieves our table container
- @return
- our table container. Guaranteed to not be <NULL/>.
- @throws ::com::sun::star::lang::WrappedTargetException
- if a non-RuntimeException is caught during obtaining the container.
- @throws ::com::sun::star::uno::RuntimeException
- if a serious error occurs
- @precond
- We're not disposed.
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
- impl_getTableContainer_throw();
-
- /** checks whether the given table name denotes an existing table
- @param _rTableName
- the fully name of the table to check for existence
- @throws ::com::sun::star::lang::IllegalArgumentException
- if the name does not denote an existing table
- @precond
- We're not disposed.
- */
- void impl_checkExistingTable_throw( const ::rtl::OUString& _rTableName );
-
- /** checks whether the given table name refers to a HSQL TEXT TABLE
- */
- bool impl_isTextTable_nothrow( const ::rtl::OUString& _rTableName );
-
- /** retrieves the icon for HSQL TEXT TABLEs
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
- impl_getTextTableIcon_nothrow();
- };
-
- //==========================================================================
- //= OHsqlConnection
- //==========================================================================
- class MethodGuard : public ::osl::MutexGuard
- {
- private:
- typedef ::osl::MutexGuard BaseGuard;
-
- public:
- MethodGuard( const IMethodGuardAccess& _rComponent )
- :BaseGuard( _rComponent.getMutex() )
- {
- _rComponent.checkDisposed();
- }
- };
- }
-}
-#endif // CONNECTIVITY_HSQLDB_CONNECTION_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
deleted file mode 100644
index e3e2296cca..0000000000
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CONNECTIVITY_HSQLDB_DRIVER_HXX
-#define CONNECTIVITY_HSQLDB_DRIVER_HXX
-
-#include <com/sun/star/sdbc/XDriver.hpp>
-#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include <com/sun/star/sdbcx/XCreateCatalog.hpp>
-#include <com/sun/star/embed/XTransactionListener.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase5.hxx>
-#include <comphelper/uno3.hxx>
-#include <comphelper/stl_types.hxx>
-#include <comphelper/broadcasthelper.hxx>
-#include "connectivity/CommonTools.hxx"
-
-//........................................................................
-namespace connectivity
-{
-//........................................................................
-
- class OMetaConnection;
-
- namespace hsqldb
- {
- ::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
- ,::com::sun::star::sdbcx::XDataDefinitionSupplier
- , ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::sdbcx::XCreateCatalog
- , ::com::sun::star::embed::XTransactionListener
- > 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
- // 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;
- sal_Bool m_bInShutDownConnections;
-
- /** load the driver we want to delegate.
- The <member>m_xDriver</member> may be <NULL/> if the driver could not be loaded.
- @return
- The driver which was currently selected.
- */
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > loadDriver( );
-
- /** shut down the connection and revoke the storage from the map
- @param _aIter
- The connection to shut down and storage to revoke.
- */
- void shutdownConnection(const TWeakPairVector::iterator& _aIter);
-
- public:
- /** creates a new delegator for a HSQLDB driver
- */
- ODriverDelegator(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory);
-
- // XServiceInfo
- DECLARE_SERVICE_INFO();
- 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);
-
- // 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);
-
- // XDataDefinitionSupplier
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( 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);
-
- // XCreateCatalog
- virtual void SAL_CALL createCatalog( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
-
- // XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
-
- // XTransactionListener
- virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL commited( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL preRevert( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL reverted( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
-
- void shutdownConnections();
- void flushConnections();
- protected:
- /// dtor
- virtual ~ODriverDelegator();
- // OComponentHelper
- virtual void SAL_CALL disposing(void);
-
- /** called when we connected to a newly created embedded database
- */
- void onConnectedNewDatabase(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection
- );
- };
- }
-
-//........................................................................
-} // namespace connectivity
-//........................................................................
-#endif // CONNECTIVITY_HSQLDB_DRIVER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.h b/connectivity/source/inc/hsqldb/HStorageAccess.h
deleted file mode 100755
index 01d42a8f38..0000000000
--- a/connectivity/source/inc/hsqldb/HStorageAccess.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess */
-
-#ifndef _Included_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
-#define _Included_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: class_00024com_00024sun_00024star_00024sdbcx_00024comp_00024hsqldb_00024StorageNativeOutputStream */
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: openStream
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
- */
-JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
- (JNIEnv *, jobject, jstring, jstring, jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: close
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: getFilePointer
- * Signature: (Ljava/lang/String;Ljava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: length
- * Signature: (Ljava/lang/String;Ljava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
- */
-JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
- (JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: readInt
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: seek
- * Signature: (Ljava/lang/String;Ljava/lang/String;J)V
- */
-JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
- (JNIEnv *, jobject, jstring, jstring, jlong);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: write
- * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V
- */
-JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
- (JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method: writeInt
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
- */
-JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
- (JNIEnv *, jobject, jstring, jstring, jint);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
deleted file mode 100644
index b543e09d5c..0000000000
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX
-#define CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX
-
-#include "hsqldb/HStorageAccess.h"
-
-namespace connectivity { namespace hsqldb
-{
- class DataLogFile;
-} }
-
-jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, jstring key, ::connectivity::hsqldb::DataLogFile* logger = NULL );
-jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = NULL );
-void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = NULL );
-void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = NULL );
-
-#endif // CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
deleted file mode 100644
index ee27fff089..0000000000
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
-#define CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
-
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/embed/XTransactionListener.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-#include <boost/shared_ptr.hpp>
-#include <comphelper/stl_types.hxx>
-#include <jni.h>
-//........................................................................
-namespace connectivity
-{
-//........................................................................
- namespace hsqldb
- {
- 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;
- 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();
- };
-
-
- DECLARE_STL_USTRINGACCESS_MAP(::boost::shared_ptr<StreamHelper>,TStreamMap);
- typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >, ::rtl::OUString > TStorageURLPair;
- typedef ::std::pair< TStorageURLPair, TStreamMap> TStoragePair;
- DECLARE_STL_USTRINGACCESS_MAP(TStoragePair,TStorages);
- /** contains all storages so far accessed.
- */
- class StorageContainer
- {
- public:
- static ::rtl::OUString registerStorage(const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& _xStorage,const ::rtl::OUString& _sURL);
- static TStorages::mapped_type getRegisteredStorage(const ::rtl::OUString& _sKey);
- static ::rtl::OUString getRegisteredKey(const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>& _xStorage);
- static void revokeStorage(const ::rtl::OUString& _sKey,const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener>& _xListener);
-
- static TStreamMap::mapped_type registerStream(JNIEnv * env,jstring name, jstring key,sal_Int32 _nMode);
- static void revokeStream(JNIEnv * env,jstring name, jstring key);
- static TStreamMap::mapped_type getRegisteredStream( JNIEnv * env, jstring name, jstring key);
-
- static ::rtl::OUString jstring2ustring(JNIEnv * env, jstring jstr);
- static ::rtl::OUString removeURLPrefix(const ::rtl::OUString& _sURL,const ::rtl::OUString& _sFileURL);
- static ::rtl::OUString removeOldURLPrefix(const ::rtl::OUString& _sURL);
- static void throwJavaException(const ::com::sun::star::uno::Exception& _aException,JNIEnv * env);
- };
- //........................................................................
- } // namespace hsqldb
- //........................................................................
-//........................................................................
-} // namespace connectivity
-
-//........................................................................
-#endif // CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
deleted file mode 100644
index a59f5b9b31..0000000000
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CONNECTIVITY_HSQLDB_TABLE_HXX
-#define CONNECTIVITY_HSQLDB_TABLE_HXX
-
-#include "connectivity/TTableHelper.hxx"
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <comphelper/IdPropArrayHelper.hxx>
-
-namespace connectivity
-{
- namespace hsqldb
- {
-
- ::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
- ,public OHSQLTable_PROP
- {
- sal_Int32 m_nPrivileges; // we have to set our privileges by our own
-
- /** executes the statmenmt.
- @param _rStatement
- The statement to execute.
- */
- void executeStatement(const ::rtl::OUString& _rStatement );
- protected:
-
- /** creates the column collection for the table
- @param _rNames
- The column names.
- */
- virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames);
-
- /** creates the key collection for the table
- @param _rNames
- The key names.
- */
- virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames);
-
- /** creates the index collection for the table
- @param _rNames
- The index names.
- */
- virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames);
-
- /** used to implement the creation of the array helper which is shared amongst all instances of the class.
- This method needs to be implemented in derived classes.
- <BR>
- The method gets called with s_aMutex acquired.
- <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.
- */
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const;
- virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
-
- public:
- OHSQLTable( sdbcx::OCollection* _pTables,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
- OHSQLTable( sdbcx::OCollection* _pTables,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
- const ::rtl::OUString& _Name,
- const ::rtl::OUString& _Type,
- const ::rtl::OUString& _Description = ::rtl::OUString(),
- const ::rtl::OUString& _SchemaName = ::rtl::OUString(),
- const ::rtl::OUString& _CatalogName = ::rtl::OUString(),
- sal_Int32 _nPrivileges = 0
- );
-
- // ODescriptor
- virtual void construct();
- // 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();
-
- 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);
- // 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);
-
- /**
- returns the ALTER TABLE XXX COLUMN statement
- */
- ::rtl::OUString getAlterTableColumnPart();
-
- // some methods to alter table structures
- void alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rColName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDescriptor);
- void alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName);
- void dropDefaultValue(const ::rtl::OUString& _sNewDefault);
-
- };
- }
-}
-#endif // CONNECTIVITY_HSQLDB_TABLE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
deleted file mode 100644
index baec755042..0000000000
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef CONNECTIVITY_HSQLDB_TABLES_HXX
-#define CONNECTIVITY_HSQLDB_TABLES_HXX
-
-#include "connectivity/sdbcx/VCollection.hxx"
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-namespace connectivity
-{
- namespace hsqldb
- {
- 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);
- 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 );
- virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
-
- void createTable( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
- virtual ::rtl::OUString getNameForObject(const sdbcx::ObjectType& _xObject);
- public:
- OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
- const TStringVector &_rVector) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector)
- ,m_xMetaData(_rMetaData)
- {}
-
- // only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing(void);
-
- // XDrop
- void appendNew(const ::rtl::OUString& _rsNewTable);
- // some helper functions
- /**
- returns a sql string which contains the column definition part for create or alter statements
- */
- static ::rtl::OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp);
- /**
- returns the "not null" part or the default part of the table statement
- */
- static ::rtl::OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp);
- /**
- returns the corresponding typename
- can contain () which have to filled with values
- */
- static ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp);
- };
- }
-}
-#endif // CONNECTIVITY_HSQLDB_TABLES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
deleted file mode 100644
index 2c1b8f4d5f..0000000000
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CONNECTIVITY_HTOOLS_HXX
-#define CONNECTIVITY_HTOOLS_HXX
-
-/** === begin UNO includes === **/
-/** === end UNO includes === **/
-
-#include <rtl/ustrbuf.hxx>
-
-//........................................................................
-namespace connectivity { namespace hsqldb
-{
-//........................................................................
-
- //====================================================================
- //= HTools
- //====================================================================
- class HTools
- {
- public:
- /** appens a proper WHERE clause to the given buffer, which filters
- for a given table name
-
- @param _bShortForm
- <TRUE/> if the column names of the system table which is being asked
- have the short form (TABLE_CAT instead of TABLE_CATALOG, and so on)
- */
- static void appendTableFilterCrit(
- ::rtl::OUStringBuffer& _inout_rBuffer, const ::rtl::OUString& _rCatalog,
- const ::rtl::OUString _rSchema, const ::rtl::OUString _rName,
- bool _bShortForm
- );
- };
-
-//........................................................................
-} } // namespace connectivity::hsqldb
-//........................................................................
-
-#endif // CONNECTIVITY_HTOOLS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
deleted file mode 100644
index d5201c63e8..0000000000
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_HSQLDB_USER_HXX_
-#define _CONNECTIVITY_HSQLDB_USER_HXX_
-
-#include "connectivity/sdbcx/VUser.hxx"
-#include "com/sun/star/sdbc/XConnection.hpp"
-
-namespace connectivity
-{
- namespace hsqldb
- {
- typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
-
- class OHSQLUser : public OUser_TYPEDEF
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
-
- ::rtl::OUString getPrivilegeString(sal_Int32 nRights) const;
- // return the privileges and additional the grant rights
- void findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- public:
- virtual void refreshGroups();
- public:
- OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
- OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::rtl::OUString& _Name);
-
- // XUser
- virtual void SAL_CALL changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- // XAuthorizable
- virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
- };
-
- class OUserExtend;
- typedef ::comphelper::OPropertyArrayUsageHelper<OUserExtend> OUserExtend_PROP;
-
- class OUserExtend : public OHSQLUser,
- public OUserExtend_PROP
- {
- protected:
- ::rtl::OUString m_Password;
- // OPropertyArrayUsageHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const;
- // OPropertySetHelper
- virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
- public:
- OUserExtend(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection);
-
- virtual void construct();
- };
- }
-}
-#endif // _CONNECTIVITY_HSQLDB_USER_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx
deleted file mode 100644
index 10bfa31eb2..0000000000
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _CONNECTIVITY_HSQLDB_USERS_HXX_
-#define _CONNECTIVITY_HSQLDB_USERS_HXX_
-
-#include "connectivity/sdbcx/VCollection.hxx"
-#include "com/sun/star/sdbc/XConnection.hpp"
-namespace connectivity
-{
- namespace sdbcx
- {
- class IRefreshableUsers;
- }
- namespace hsqldb
- {
- class OUsers : public sdbcx::OCollection
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- 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();
- 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 );
- virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
- public:
- 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);
- };
- }
-}
-
-#endif // _CONNECTIVITY_HSQLDB_USERS_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
deleted file mode 100644
index 51117c9914..0000000000
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef CONNECTIVITY_HVIEW_HXX
-#define CONNECTIVITY_HVIEW_HXX
-
-#include "connectivity/sdbcx/VView.hxx"
-
-/** === begin UNO includes === **/
-#include <com/sun/star/sdbcx/XAlterView.hpp>
-/** === end UNO includes === **/
-
-#include <comphelper/uno3.hxx>
-#include <cppuhelper/implbase1.hxx>
-
-//........................................................................
-namespace connectivity { namespace hsqldb
-{
-//........................................................................
-
- //====================================================================
- //= HView
- //====================================================================
- typedef ::connectivity::sdbcx::OView HView_Base;
- typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XAlterView > HView_IBASE;
- class HView :public HView_Base
- ,public HView_IBASE
- {
- public:
- HView(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
- sal_Bool _bCaseSensitive,
- const ::rtl::OUString& _rSchemaName,
- const ::rtl::OUString& _rName
- );
-
- // UNO
- DECLARE_XINTERFACE()
- DECLARE_XTYPEPROVIDER()
-
- // XAlterView
- virtual void SAL_CALL alterCommand( const ::rtl::OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-
- protected:
- virtual ~HView();
-
- protected:
- // OPropertyContainer
- virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const;
-
- private:
- /** 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
- <arg>_bAllowSQLExceptin</arg> is <FALSE/>
- @throws ::com::sun::star::sdbc::SQLException
- 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;
-
- private:
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- private:
- using HView_Base::getFastPropertyValue;
- };
-
-//........................................................................
-} } // namespace connectivity::hsqldb
-//........................................................................
-
-#endif // CONNECTIVITY_HVIEW_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
deleted file mode 100644
index ee2f61e6ab..0000000000
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _CONNECTIVITY_HSQLDB_VIEWS_HXX_
-#define _CONNECTIVITY_HSQLDB_VIEWS_HXX_
-
-#include "connectivity/sdbcx/VCollection.hxx"
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-namespace connectivity
-{
- namespace hsqldb
- {
- class HViews : public sdbcx::OCollection
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
- sal_Bool m_bInDrop;
-
- protected:
- virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
- virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
- 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 );
- virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
-
- void createView( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
- public:
- HViews(
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
- ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector );
-
- // only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing(void);
-
- void dropByNameImpl(const ::rtl::OUString& elementName);
- };
- }
-}
-#endif // _CONNECTIVITY_HSQLDB_VIEWS_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/StorageFileAccess.h b/connectivity/source/inc/hsqldb/StorageFileAccess.h
deleted file mode 100755
index c99a16f6df..0000000000
--- a/connectivity/source/inc/hsqldb/StorageFileAccess.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess */
-
-#ifndef _Included_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
-#define _Included_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
- * Method: isStreamElement
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
- * Method: removeElement
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
- * Method: renameElement
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
- (JNIEnv *, jobject, jstring, jstring, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
deleted file mode 100755
index 2c635de5a1..0000000000
--- a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream */
-
-#ifndef _Included_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
-#define _Included_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: class_00024com_00024sun_00024star_00024sdbcx_00024comp_00024hsqldb_00024StorageNativeOutputStream */
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: openStream
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
- */
-JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
- (JNIEnv * env, jobject obj_this,jstring key, jstring name, jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
- (JNIEnv * env, jobject obj_this,jstring key, jstring name);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
- */
-JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
- (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray, jint, jint);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: close
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: skip
- * Signature: (Ljava/lang/String;Ljava/lang/String;J)J
- */
-JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
- (JNIEnv *, jobject, jstring, jstring, jlong);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: available
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
- (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method: read
- * Signature: (Ljava/lang/String;Ljava/lang/String;[B)I
- */
-JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
- (JNIEnv *, jobject, jstring, jstring, jbyteArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */