diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-10 14:17:11 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-10 14:17:11 +0100 |
commit | 0b7561676142676005dc6a6724ca274c55235dea (patch) | |
tree | 3c74a4485d4a95c680ca3bc8dfcb5bb578ee5b78 /offapi/com/sun/star/sdb | |
parent | b6a103b358d03e0dcb2693c57601df3280f2ad6e (diff) | |
parent | a8b830c3346bbce395ed1d900e964d70940bd98a (diff) |
merge
Diffstat (limited to 'offapi/com/sun/star/sdb')
-rw-r--r-- | offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl (renamed from offapi/com/sun/star/sdb/tools/XConnectionSupport.idl) | 8 | ||||
-rw-r--r-- | offapi/com/sun/star/sdb/tools/XIndexAlteration.idl | 4 | ||||
-rw-r--r-- | offapi/com/sun/star/sdb/tools/XKeyAlteration.idl | 4 | ||||
-rw-r--r-- | offapi/com/sun/star/sdb/tools/XTableAlteration.idl | 11 | ||||
-rw-r--r-- | offapi/com/sun/star/sdb/tools/XTableRename.idl | 4 | ||||
-rw-r--r-- | offapi/com/sun/star/sdb/tools/XViewAccess.idl (renamed from offapi/com/sun/star/sdb/tools/XViewSupport.idl) | 16 | ||||
-rw-r--r-- | offapi/com/sun/star/sdb/tools/makefile.mk | 4 |
7 files changed, 27 insertions, 24 deletions
diff --git a/offapi/com/sun/star/sdb/tools/XConnectionSupport.idl b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl index df5af67899f8..c0ec570ccf60 100644 --- a/offapi/com/sun/star/sdb/tools/XConnectionSupport.idl +++ b/offapi/com/sun/star/sdb/tools/XConnectionSupplier.idl @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XConnectionSupport.idl,v $ + * $RCSfile: XConnectionSupplier.idl,v $ * $Revision: 1.3 $ * * This file is part of OpenOffice.org. @@ -28,8 +28,8 @@ * ************************************************************************/ -#ifndef __com_sun_star_sdb_tools_XConnectionSupport_idl__ -#define __com_sun_star_sdb_tools_XConnectionSupport_idl__ +#ifndef __com_sun_star_sdb_tools_XConnectionSupplier_idl__ +#define __com_sun_star_sdb_tools_XConnectionSupplier_idl__ #include <com/sun/star/sdbc/XConnection.idl> #ifndef __com_sun_star_lang_XInitialization_idl__ @@ -50,7 +50,7 @@ module com { module sun { module star { module sdb { module tools { @since OOo 3.3 */ -interface XConnectionSupport +interface XConnectionSupplier { /** returns the source connection. */ diff --git a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl index 12ed8fd55266..fdc7ce517ca8 100644 --- a/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl +++ b/offapi/com/sun/star/sdb/tools/XIndexAlteration.idl @@ -34,7 +34,7 @@ #ifndef __com_sun_star_sdbc_SQLException_idl__ #include <com/sun/star/sdbc/SQLException.idl> #endif -#include <com/sun/star/sdb/tools/XConnectionSupport.idl> +#include <com/sun/star/sdb/tools/XConnectionSupplier.idl> #ifndef __com_sun_star_lang_XInitialization_idl__ #include <com/sun/star/lang/XInitialization.idl> #endif @@ -57,7 +57,7 @@ module com { module sun { module star { module sdb { module tools { */ interface XIndexAlteration { - interface XConnectionSupport; + interface XConnectionSupplier; /** drops an object of the related container identified by its name. @param table diff --git a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl index 12b4c0bc22bc..44389dfe64fd 100644 --- a/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl +++ b/offapi/com/sun/star/sdb/tools/XKeyAlteration.idl @@ -34,7 +34,7 @@ #ifndef __com_sun_star_sdbc_SQLException_idl__ #include <com/sun/star/sdbc/SQLException.idl> #endif -#include <com/sun/star/sdb/tools/XConnectionSupport.idl> +#include <com/sun/star/sdb/tools/XConnectionSupplier.idl> #ifndef __com_sun_star_lang_XInitialization_idl__ #include <com/sun/star/lang/XInitialization.idl> #endif @@ -57,7 +57,7 @@ module com { module sun { module star { module sdb { module tools { */ interface XKeyAlteration { - interface XConnectionSupport; + interface XConnectionSupplier; /** drops an object of the related container identified by its name. @param table diff --git a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl index d57feff8d4c0..fe0fe494fead 100644 --- a/offapi/com/sun/star/sdb/tools/XTableAlteration.idl +++ b/offapi/com/sun/star/sdb/tools/XTableAlteration.idl @@ -34,7 +34,7 @@ #ifndef __com_sun_star_sdbc_SQLException_idl__ #include <com/sun/star/sdbc/SQLException.idl> #endif -#include <com/sun/star/sdb/tools/XConnectionSupport.idl> +#include <com/sun/star/sdb/tools/XConnectionSupplier.idl> #ifndef __com_sun_star_lang_XInitialization_idl__ #include <com/sun/star/lang/XInitialization.idl> #endif @@ -47,7 +47,7 @@ module com { module sun { module star { module sdb { module tools { //============================================================================= //----------------------------------------------------------------------------- -/** allows to alter table. +/** allows to alter a table. @see com::sun::star::sdb::DataSource::Settings @see com::sun::star::sdbcx::ColumnDescriptor @@ -59,9 +59,9 @@ module com { module sun { module star { module sdb { module tools { */ interface XTableAlteration { - interface XConnectionSupport; + interface XConnectionSupplier; - /** rename the given table to the new name + /** alter the column defined by name @param table the table to be altered @@ -73,6 +73,7 @@ interface XTableAlteration the column descriptor with the information of the new column definition @throws com::sun::star::sdbc::SQLException + @see com::sun::star::sdbcx::XAlterTable */ void alterColumnByName( [in] com::sun::star::beans::XPropertySet table, [in] string columnName, [in] com::sun::star::beans::XPropertySet columnDescriptor) raises ( com::sun::star::sdbc::SQLException ); @@ -89,6 +90,7 @@ interface XTableAlteration the descriptor which should be serve to append a new object @throws com::sun::star::sdbc::SQLException if a database access error occurs. + @see com::sun::star::sdbcx::XAppend */ void addColumn([in] com::sun::star::beans::XPropertySet table,[in]com::sun::star::beans::XPropertySet descriptor) raises (com::sun::star::sdbc::SQLException); @@ -100,6 +102,7 @@ interface XTableAlteration the name of the column to be dropped @throws com::sun::star::sdbc::SQLException if a database access error occurs. + @see com::sun::star::sdbcx::XDrop */ void dropColumn([in] com::sun::star::beans::XPropertySet table,[in]string columnName) raises ( com::sun::star::sdbc::SQLException); diff --git a/offapi/com/sun/star/sdb/tools/XTableRename.idl b/offapi/com/sun/star/sdb/tools/XTableRename.idl index 5c4a14695ea8..f61d736bae8c 100644 --- a/offapi/com/sun/star/sdb/tools/XTableRename.idl +++ b/offapi/com/sun/star/sdb/tools/XTableRename.idl @@ -34,7 +34,7 @@ #ifndef __com_sun_star_sdbc_SQLException_idl__ #include <com/sun/star/sdbc/SQLException.idl> #endif -#include <com/sun/star/sdb/tools/XConnectionSupport.idl> +#include <com/sun/star/sdb/tools/XConnectionSupplier.idl> #ifndef __com_sun_star_lang_XInitialization_idl__ #include <com/sun/star/lang/XInitialization.idl> #endif @@ -55,7 +55,7 @@ module com { module sun { module star { module sdb { module tools { */ interface XTableRename { - interface XConnectionSupport; + interface XConnectionSupplier; /** rename the given table to the new name diff --git a/offapi/com/sun/star/sdb/tools/XViewSupport.idl b/offapi/com/sun/star/sdb/tools/XViewAccess.idl index 51367386dc30..e64727341e81 100644 --- a/offapi/com/sun/star/sdb/tools/XViewSupport.idl +++ b/offapi/com/sun/star/sdb/tools/XViewAccess.idl @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: XViewSupport.idl,v $ + * $RCSfile: XViewAccess.idl,v $ * $Revision: 1.3 $ * * This file is part of OpenOffice.org. @@ -28,13 +28,13 @@ * ************************************************************************/ -#ifndef __com_sun_star_sdb_tools_XViewSupport_idl__ -#define __com_sun_star_sdb_tools_XViewSupport_idl__ +#ifndef __com_sun_star_sdb_tools_XViewAccess_idl__ +#define __com_sun_star_sdb_tools_XViewAccess_idl__ #ifndef __com_sun_star_sdbc_SQLException_idl__ #include <com/sun/star/sdbc/SQLException.idl> #endif -#include <com/sun/star/sdb/tools/XConnectionSupport.idl> +#include <com/sun/star/sdb/tools/XConnectionSupplier.idl> #ifndef __com_sun_star_lang_XInitialization_idl__ #include <com/sun/star/lang/XInitialization.idl> #endif @@ -47,16 +47,16 @@ module com { module sun { module star { module sdb { module tools { //============================================================================= //----------------------------------------------------------------------------- -/** allows to fetch the sql statements of views +/** allows to fetch and to change the sql statements of views @see com::sun::star::sdb::DataSource::Settings @see com::sun::star::sdbcx::View @since OOo 3.3 */ -interface XViewSupport +interface XViewAccess { - interface XConnectionSupport; + interface XConnectionSupplier; /** returns the SQL statement of the view @@ -67,7 +67,7 @@ interface XViewSupport string getCommand( [in] com::sun::star::beans::XPropertySet view) raises ( com::sun::star::sdbc::SQLException ); - /** rename the given table to the new name + /** allows to alter the SQL statement of a view @param view the view to be altered diff --git a/offapi/com/sun/star/sdb/tools/makefile.mk b/offapi/com/sun/star/sdb/tools/makefile.mk index d654250b5eaf..056a2f178e5b 100644 --- a/offapi/com/sun/star/sdb/tools/makefile.mk +++ b/offapi/com/sun/star/sdb/tools/makefile.mk @@ -50,11 +50,11 @@ IDLFILES=\ XObjectNames.idl \ XTableName.idl \ XTableRename.idl \ - XViewSupport.idl \ + XViewAccess.idl \ XTableAlteration.idl \ XKeyAlteration.idl \ XIndexAlteration.idl \ - XConnectionSupport.idl + XConnectionSupplier.idl # ------------------------------------------------------------------ .INCLUDE : target.mk |