offapi/UnoApi_offapi.mk | 2 ++
offapi/com/sun/star/sdbc/PseudoColumnUsage.idl | 14 ++------------
offapi/com/sun/star/sdbc/XDatabaseMetaData3.idl | 2 +-
offapi/com/sun/star/sdbc/XRowId.idl | 20 +++++---------------
4 files changed, 10 insertions(+), 28 deletions(-)
New commits:
commit 51e8bb0db422c485d586a36b59201e0019801a76
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Feb 14 16:52:36 2025 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Feb 17 09:12:16 2025 +0100
Fix license + footer + rename RowId into XRowId
+ use PseudoColumnUsage and XRowId in UnoApi_offapi.mk
+fix errors in XRowId.idl
Change-Id: Id4e6c23872618752b6e24c91e7efecefcfac7177
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181674
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Jenkins
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 8e79c960515b..066bfe02ef25 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3289,6 +3289,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/sdbc,\
KeyRule \
ProcedureColumn \
ProcedureResult \
+ PseudoColumnUsage \
ResultSetConcurrency \
ResultSetType \
RowIdLifetime \
@@ -3326,6 +3327,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/sdbc,\
XResultSetMetaDataSupplier \
XResultSetUpdate \
XRow \
+ XRowId \
XRowSet \
XRowSetListener \
XRowUpdate \
diff --git a/offapi/com/sun/star/sdbc/PseudoColumnUsage.idl
b/offapi/com/sun/star/sdbc/PseudoColumnUsage.idl
index e3ffbe389162..80023fdbb975 100644
--- a/offapi/com/sun/star/sdbc/PseudoColumnUsage.idl
+++ b/offapi/com/sun/star/sdbc/PseudoColumnUsage.idl
@@ -1,20 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
module com { module sun { module star { module sdbc {
@@ -49,4 +39,4 @@ constants PseudoColumnUsage
/*===========================================================================
===========================================================================*/
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData3.idl
b/offapi/com/sun/star/sdbc/XDatabaseMetaData3.idl
index b82b20399bdb..b05d2fdf5313 100644
--- a/offapi/com/sun/star/sdbc/XDatabaseMetaData3.idl
+++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData3.idl
@@ -386,7 +386,7 @@ interface XDatabaseMetaData3 : XDatabaseMetaData2
/**
* Indicates whether this data source supports the SQL {@code ROWID} type,
- * and the lifetime for which a RowId (see RowId.idl) object remains valid.
+ * and the lifetime for which a XRowId (see XRowId.idl) object remains
valid.
*
* @return one of the constants from RowIdLifetime (see RowIdLifetime.idl)
* @throws SQLException if a database access error occurs
diff --git a/offapi/com/sun/star/sdbc/RowId.idl
b/offapi/com/sun/star/sdbc/XRowId.idl
similarity index 70%
rename from offapi/com/sun/star/sdbc/RowId.idl
rename to offapi/com/sun/star/sdbc/XRowId.idl
index 57bbd4419929..976480d4590e 100644
--- a/offapi/com/sun/star/sdbc/RowId.idl
+++ b/offapi/com/sun/star/sdbc/XRowId.idl
@@ -1,20 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
module com { module sun { module star { module sdbc {
@@ -26,20 +16,20 @@
@since LibreOffice 25.8
*/
-interface RowId
+interface XRowId
{
/** Compares this RowId to the specified object.
@throws SQLException
if a database access error occurs.
*/
- boolean equals(Object obj);
+ boolean equals([in]any x);
/** Returns an array of bytes representing the value of the SQL ROWID
designated by this RowId object.
@throws SQLException
if a database access error occurs.
*/
- byte[] getBytes();
+ sequence<byte> getBytes();
/** Returns a hash code value of this RowId object.
@throws SQLException
@@ -60,4 +50,4 @@ interface RowId
/*===========================================================================
===========================================================================*/
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
