[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 11 commits - connectivity/java desktop/win32 extensions.lst external_deps.lst instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo odk/util
Matthias Seidel
mseidel at apache.org
Thu Aug 31 15:13:15 UTC 2017
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java | 2
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java | 17
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/OfficeResourceBundle.java | 12
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java | 10
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java | 63 -
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexColumnContainer.java | 10
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexContainer.java | 10
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyColumnContainer.java | 10
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyContainer.java | 10
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java | 2
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java | 12
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java | 2
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java | 4
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java | 2
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java | 4
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DBTypeConversion.java | 46
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java | 551 +++++-----
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/ISQLStatementHelper.java | 4
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/ORowSetValue.java | 10
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/Resources.java | 2
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/SharedResources.java | 17
desktop/win32/source/setup/setup.ico |binary
extensions.lst | 2
external_deps.lst | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 114 +-
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 120 +-
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 114 +-
odk/util/makefile.pmk | 2
28 files changed, 633 insertions(+), 521 deletions(-)
New commits:
commit b2100fd177146a7454bae83b0048915cf2bb5f7b
Author: Matthias Seidel <mseidel at apache.org>
Date: Tue Aug 29 15:48:01 2017 +0000
Use same icon as in setup_native
diff --git a/desktop/win32/source/setup/setup.ico b/desktop/win32/source/setup/setup.ico
index 2a7ebda53a25..6a5e9355a1c9 100644
Binary files a/desktop/win32/source/setup/setup.ico and b/desktop/win32/source/setup/setup.ico differ
commit 6c3b211eb376d49128fd6e7afd14b125a95b011d
Author: Damjan Jovanovic <damjan at apache.org>
Date: Mon Aug 28 02:26:37 2017 +0000
Access cleanups. Keep OContainer abstract methods protected
instead of public. Also added some Javadoc for OContainer.
Patch by: me
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java
index a50aa31f1f3a..327aa39e3829 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java
@@ -68,7 +68,7 @@ public class OColumnContainer extends OContainer {
}
@Override
- public XPropertySet createObject(String name) throws SQLException {
+ protected XPropertySet createObject(String name) throws SQLException {
boolean queryInfo = true;
boolean isAutoIncrement = false;
boolean isCurrency = false;
@@ -102,22 +102,22 @@ public class OColumnContainer extends OContainer {
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxColumnDescriptor.create(isCaseSensitive());
}
@Override
- public void impl_refresh() {
+ protected void impl_refresh() {
extraColumnInfo.clear();
table.refreshColumns();
}
@Override
- public XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
+ protected XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
return null;
}
@Override
- public void dropObject(int index, String name) throws SQLException {
+ protected void dropObject(int index, String name) throws SQLException {
}
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
index a307b68abab6..50d1d48f7623 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
@@ -54,6 +54,7 @@ import com.sun.star.sdbcx.XDataDescriptorFactory;
import com.sun.star.sdbcx.XDrop;
import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
import com.sun.star.sdbcx.comp.postgresql.comphelper.OEnumerationByIndex;
+import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.sdbcx.comp.postgresql.util.Resources;
import com.sun.star.sdbcx.comp.postgresql.util.SharedResources;
import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
@@ -244,17 +245,6 @@ public abstract class OContainer extends WeakBase implements
}
}
- protected String getNameForObject(XPropertySet object) {
- try {
- Object ret = object.getPropertyValue("Name");
- return AnyConverter.toString(ret);
- } catch (WrappedTargetException wrappedTargetException) {
- } catch (UnknownPropertyException unknownPropertyException) {
- } catch (IllegalArgumentException illegalArgumentException) {
- }
- return null;
- }
-
// XAppend
@Override
@@ -406,6 +396,11 @@ public abstract class OContainer extends WeakBase implements
return -1;
}
+ /** return the object, if not existent it creates it.
+ * @param index
+ * The index of the object to create.
+ * @return ObjectType
+ */
protected Object getObject(int index) throws WrappedTargetException {
PropertyInfo propertyInfo = entriesByIndex.get(index);
HashMap<Long,XPropertySet> entriesById = entriesByNameAndId.get(propertyInfo.name);
@@ -425,6 +420,15 @@ public abstract class OContainer extends WeakBase implements
return propertySet;
}
+ /** clones the given descriptor
+ *
+ * The method calls createDescriptor to create a new, empty descriptor, and then copies all properties from
+ * descriptor to the new object, which is returned.
+ *
+ * This method might come handy in derived classes for implementing appendObject, when the object
+ * is not actually appended to any backend (e.g. for the columns collection of a descriptor object itself,
+ * where there is not yet a database backend to append the column to).
+ */
protected XPropertySet cloneDescriptor(XPropertySet descriptor) {
XPropertySet newDescriptor = createDescriptor();
CompHelper.copyProperties(descriptor, newDescriptor);
@@ -435,17 +439,34 @@ public abstract class OContainer extends WeakBase implements
return isCaseSensitive;
}
- // will be called when a object was requested by one of the accessing methods like getByIndex
- public abstract XPropertySet createObject(final String name) throws SQLException;
+ /** returns the name for the object. The default implementation ask for the property "Name". If this doesn't satisfy, it has to be overloaded.
+ * @param object The object where the name should be extracted.
+ * @return The name of the object.
+ */
+ protected String getNameForObject(XPropertySet object) throws SQLException {
+ try {
+ Object name = object.getPropertyValue(PropertyIds.NAME.name);
+ return AnyConverter.toString(name);
+ } catch (WrappedTargetException | UnknownPropertyException | IllegalArgumentException exception) {
+ throw new SQLException("Error", this, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, exception);
+ }
+ }
+
+ /// Will be called when a object was requested by one of the accessing methods like getByIndex.
+ protected abstract XPropertySet createObject(final String name) throws SQLException;
- public abstract void dropObject(int index, String name) throws SQLException;
+ /// Called when XDrop was called.
+ protected abstract void dropObject(int index, String name) throws SQLException;
- // the implementing class should refresh their elements
- public abstract void impl_refresh();
+ // The implementing class should refresh their elements.
+ protected abstract void impl_refresh();
- // will be called when a new object should be generated by a call of createDataDescriptor
- // the returned object is empty will be filled outside and added to the collection
- public abstract XPropertySet createDescriptor();
+ /** Will be called when a new object should be generated by a call of createDataDescriptor;
+ *
+ * @return
+ * the returned object, empty, to be filled, and added to the collection.
+ */
+ protected abstract XPropertySet createDescriptor();
/** appends an object described by a descriptor, under a given name
@param _rForName
@@ -458,6 +479,6 @@ public abstract class OContainer extends WeakBase implements
the new object which is to be inserted into the collection. This might be the result
of a call of <code>createObject( _rForName )</code>, or a clone of the descriptor.
*/
- public abstract XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException;
+ protected abstract XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException;
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexColumnContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexColumnContainer.java
index 5e6db41bed7b..ecfdaa719abe 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexColumnContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexColumnContainer.java
@@ -46,12 +46,12 @@ public class OIndexColumnContainer extends OContainer {
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxIndexColumnDescriptor.create(isCaseSensitive());
}
@Override
- public XPropertySet createObject(String name) throws SQLException {
+ protected XPropertySet createObject(String name) throws SQLException {
try {
Object catalog = index.getTable().getPropertyValue(PropertyIds.CATALOGNAME.name);
String schema = AnyConverter.toString(index.getTable().getPropertyValue(PropertyIds.SCHEMANAME.name));
@@ -105,17 +105,17 @@ public class OIndexColumnContainer extends OContainer {
}
@Override
- public void impl_refresh() {
+ protected void impl_refresh() {
// FIXME
}
@Override
- public XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
+ protected XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
throw new SQLException("Unsupported");
}
@Override
- public void dropObject(int index, String name) throws SQLException {
+ protected void dropObject(int index, String name) throws SQLException {
throw new SQLException("Unsupported");
}
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexContainer.java
index c5109335a616..0aafd730406b 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexContainer.java
@@ -56,12 +56,12 @@ public class OIndexContainer extends OContainer {
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxIndexDescriptor.create(isCaseSensitive());
}
@Override
- public XPropertySet createObject(String name) throws SQLException {
+ protected XPropertySet createObject(String name) throws SQLException {
try {
XConnection connection = table.getConnection();
if (connection == null) {
@@ -135,7 +135,7 @@ public class OIndexContainer extends OContainer {
}
@Override
- public XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
+ protected XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
try {
XConnection connection = table.getConnection();
if (connection == null) {
@@ -176,7 +176,7 @@ public class OIndexContainer extends OContainer {
}
@Override
- public void dropObject(int index, String elementName) throws SQLException {
+ protected void dropObject(int index, String elementName) throws SQLException {
XConnection connection = table.getConnection();
if (connection == null) {
return;
@@ -202,7 +202,7 @@ public class OIndexContainer extends OContainer {
}
@Override
- public void impl_refresh() {
+ protected void impl_refresh() {
// FIXME
}
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyColumnContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyColumnContainer.java
index 0fc5aa495589..e5c48944f5e7 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyColumnContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyColumnContainer.java
@@ -45,12 +45,12 @@ public class OKeyColumnContainer extends OContainer {
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxKeyColumnDescriptor.create(isCaseSensitive());
}
@Override
- public XPropertySet createObject(String name) throws SQLException {
+ protected XPropertySet createObject(String name) throws SQLException {
try {
XPropertySet tableProperties = UnoRuntime.queryInterface(XPropertySet.class, key.getTable());
Object catalog = tableProperties.getPropertyValue(PropertyIds.CATALOGNAME.name);
@@ -100,16 +100,16 @@ public class OKeyColumnContainer extends OContainer {
}
@Override
- public void impl_refresh() {
+ protected void impl_refresh() {
}
@Override
- public XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
+ protected XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
throw new SQLException("Cannot change a key's columns, please delete and re-create the key instead");
}
@Override
- public void dropObject(int index, String name) throws SQLException {
+ protected void dropObject(int index, String name) throws SQLException {
throw new SQLException("Cannot change a key's columns, please delete and re-create the key instead");
}
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyContainer.java
index d00f9018a115..b8bab1d5b55c 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyContainer.java
@@ -85,12 +85,12 @@ public class OKeyContainer extends OContainer {
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxKeyDescriptor.create(isCaseSensitive());
}
@Override
- public XPropertySet createObject(String name) throws SQLException {
+ protected XPropertySet createObject(String name) throws SQLException {
OKey ret = null;
if (!name.isEmpty()) {
@@ -106,12 +106,12 @@ public class OKeyContainer extends OContainer {
}
@Override
- public void impl_refresh() {
+ protected void impl_refresh() {
//throw new NotImplementedException("");
}
@Override
- public XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
+ protected XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
XConnection connection = table.getConnection();
if (connection == null) {
return null;
@@ -235,7 +235,7 @@ public class OKeyContainer extends OContainer {
}
@Override
- public void dropObject(int index, String name) throws SQLException {
+ protected void dropObject(int index, String name) throws SQLException {
XConnection connection = table.getConnection();
if (connection == null) {
return;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java
index 25ae2a597b4d..5b9b945e5f10 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java
@@ -30,7 +30,7 @@ public class SdbcxColumnDescriptorContainer extends SdbcxDescriptorContainer {
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxColumnDescriptor.create(isCaseSensitive());
}
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java
index c07e711e3765..16baf4cf680b 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java
@@ -36,7 +36,7 @@ public abstract class SdbcxDescriptorContainer extends OContainer {
}
@Override
- public XPropertySet createObject(String name) throws SQLException {
+ protected XPropertySet createObject(String name) throws SQLException {
// This should never be called. DescriptorContainer always starts off empty,
// and only grows as a result of appending.
String error = SharedResources.getInstance().getResourceString(
@@ -45,15 +45,15 @@ public abstract class SdbcxDescriptorContainer extends OContainer {
}
@Override
- public void dropObject(int index, String name) throws SQLException {
+ protected void dropObject(int index, String name) throws SQLException {
}
@Override
- public void impl_refresh() {
+ protected void impl_refresh() {
}
@Override
- public XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
+ protected XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
return cloneDescriptor(descriptor);
}
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java
index f7a5e5e945a1..528f252ad054 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java
@@ -29,7 +29,7 @@ public class SdbcxIndexColumnDescriptorContainer extends SdbcxDescriptorContaine
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxIndexColumnDescriptor.create(isCaseSensitive());
}
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java
index df169dc0f50a..d40c735b0089 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java
@@ -31,12 +31,12 @@ public class SdbcxIndexDescriptorContainer extends SdbcxDescriptorContainer {
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxIndexDescriptor.create(isCaseSensitive());
}
@Override
- public XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
+ protected XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
XPropertySet newDescriptor = cloneDescriptor(descriptor);
DbTools.cloneDescriptorColumns(descriptor, newDescriptor);
return newDescriptor;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java
index bb3aed4bbb1c..4b5824489f3c 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java
@@ -29,7 +29,7 @@ public class SdbcxKeyColumnDescriptorContainer extends SdbcxDescriptorContainer
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxKeyColumnDescriptor.create(isCaseSensitive());
}
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java
index e387ac49a3ff..b1fc537ca5b8 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java
@@ -31,12 +31,12 @@ public class SdbcxKeyDescriptorContainer extends SdbcxDescriptorContainer {
}
@Override
- public XPropertySet createDescriptor() {
+ protected XPropertySet createDescriptor() {
return SdbcxKeyDescriptor.create(isCaseSensitive());
}
@Override
- public XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
+ protected XPropertySet appendObject(String _rForName, XPropertySet descriptor) throws SQLException {
XPropertySet newDescriptor = cloneDescriptor(descriptor);
DbTools.cloneDescriptorColumns(descriptor, newDescriptor);
return newDescriptor;
commit f74e0843b1c0222694dc070590933dba60f97a80
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Aug 27 16:12:09 2017 +0000
More Javadoc for helper classes.
Patch by: me
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/OfficeResourceBundle.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/OfficeResourceBundle.java
index 027a282fa5bb..cf714979fd43 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/OfficeResourceBundle.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/OfficeResourceBundle.java
@@ -42,8 +42,8 @@ public class OfficeResourceBundle implements AutoCloseable {
the component context to operate in
@param bundleBaseName
the base name of the resource file which should be accessed (*without* the SUPD!)
- @raises ::com::sun::star::lang::NullPointerException
- if the given component context is <NULL/>
+ @throws com.sun.star.lang.NullPointerException
+ if the given component context is null
*/
public OfficeResourceBundle(XComponentContext context, String bundleBaseName) throws NullPointerException {
if (context == null) {
@@ -64,8 +64,7 @@ public class OfficeResourceBundle implements AutoCloseable {
the id of the string to load
@return
the requested resource string. If no string with the given id exists in the resource bundle,
- an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this
- then.
+ an empty string is returned.
*/
public String loadString( int _resourceId ) {
synchronized (this) {
@@ -85,7 +84,7 @@ public class OfficeResourceBundle implements AutoCloseable {
@param _resourceId
the id of the string whose existence is to be checked
@return
- <TRUE/> if and only if a string with the given ID exists in the resource
+ true if and only if a string with the given ID exists in the resource
bundle.
*/
public boolean hasString( int _resourceId ) {
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
index 59b4883909ea..f4ebf8a7d74f 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
@@ -139,6 +139,8 @@ public class DbTools {
}
}
+ /** compose a complete table name from it's up to three parts, regarding to the database meta data composing rules
+ */
public static String composeTableName(
XDatabaseMetaData metadata, String catalog, String schema, String table, boolean quote, ComposeRule composeRule) throws SQLException {
if (metadata == null) {
@@ -182,6 +184,11 @@ public class DbTools {
shouldQuote, composeRule);
}
+ /** check if a specific property is enabled in the info sequence
+ * @deprecated
+ * Use getBooleanDataSourceSetting instead, which cares for the default of the property itself,
+ * instead of spreading this knowledge through all callers.
+ */
public static boolean isDataSourcePropertyEnabled(Object object, String property, boolean defaultValue) throws SQLException {
try {
boolean enabled = defaultValue;
@@ -201,6 +208,8 @@ public class DbTools {
}
}
+ /** search the parent hierarchy for a data source.
+ */
public static XDataSource findDataSource(Object parent) {
XOfficeDatabaseDocument databaseDocument = UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, parent);
XDataSource dataSource = null;
@@ -252,6 +261,12 @@ public class DbTools {
return composedName.toString();
}
+ /** composes a table name for usage in a SELECT statement
+ *
+ * This includes quoting of the table as indicated by the connection's meta data, plus respecting
+ * the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present
+ * in the data source which the connection belongs to.
+ */
public static String composeTableNameForSelect(XConnection connection, String catalog,
String schema, String table) throws SQLException {
boolean useCatalogInSelect = isDataSourcePropertyEnabled(connection, "UseCatalogInSelect", true);
@@ -260,6 +275,12 @@ public class DbTools {
useSchemaInSelect ? schema : "", table, true, ComposeRule.InDataManipulation);
}
+ /** composes a table name for usage in a SELECT statement
+ *
+ * This includes quoting of the table as indicated by the connection's meta data, plus respecting
+ * the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present
+ * in the data source which the connection belongs to.
+ */
public static String composeTableNameForSelect(XConnection connection, XPropertySet table) throws SQLException {
NameComponents nameComponents = getTableNameComponents(table);
return composeTableNameForSelect(connection, nameComponents.getCatalog(), nameComponents.getSchema(), nameComponents.getTable());
@@ -285,6 +306,8 @@ public class DbTools {
}
}
+ /** quote the given name with the given quote string.
+ */
public static String quoteName(String quote, String name) {
if (!quote.isEmpty() && quote.codePointAt(0) != ' ') {
return quote + name + quote;
@@ -292,11 +315,19 @@ public class DbTools {
return name;
}
+ /** quote the given table name (which may contain a catalog and a schema) according to the rules provided by the meta data
+ */
public static String quoteTableName(XDatabaseMetaData metadata, String name, ComposeRule composeRule) throws SQLException {
NameComponents nameComponents = qualifiedNameComponents(metadata, name, composeRule);
return doComposeTableName(metadata, nameComponents.getCatalog(), nameComponents.getSchema(), nameComponents.getTable(), true, composeRule);
}
+ /** split a fully qualified table name (including catalog and schema, if applicable) into its component parts.
+ * @param _rxConnMetaData meta data describing the connection where you got the table name from
+ * @param _rQualifiedName fully qualified table name
+ * @param _eComposeRule where do you need the name for
+ * @return the NameComponents object with the catalog, schema and table
+ */
public static NameComponents qualifiedNameComponents(XDatabaseMetaData _rxConnMetaData, String _rQualifiedName,
ComposeRule _eComposeRule) throws SQLException {
Osl.ensure(_rxConnMetaData, "QualifiedNameComponents : invalid meta data!");
@@ -339,6 +370,19 @@ public class DbTools {
return ret;
}
+ /** creates a SQL CREATE TABLE statement
+ *
+ * @param descriptor
+ * The descriptor of the new table.
+ * @param connection
+ * The connection.
+ * @param helper
+ * Allow to add special SQL constructs.
+ * @param createPattern
+ *
+ * @return
+ * The CREATE TABLE statement.
+ */
public static String createSqlCreateTableStatement(XPropertySet descriptor, XConnection connection,
ISQLStatementHelper helper, String createPattern) throws SQLException {
@@ -352,6 +396,16 @@ public class DbTools {
return sql;
}
+ /** creates the standard sql create table statement without the key part.
+ * @param descriptor
+ * The descriptor of the new table.
+ * @param connection
+ * The connection.
+ * @param helper
+ * Allow to add special SQL constructs.
+ * @param createPattern
+ *
+ */
public static String createStandardCreateStatement(XPropertySet descriptor, XConnection connection,
ISQLStatementHelper helper, String createPattern) throws SQLException {
try {
@@ -394,6 +448,16 @@ public class DbTools {
}
}
+ /** creates the standard sql statement for the column part of a create table statement.
+ * @param columnProperties
+ * The descriptor of the column.
+ * @param connection
+ * The connection.
+ * @param helper
+ * Allow to add special SQL constructs.
+ * @param createPattern
+ *
+ */
public static String createStandardColumnPart(XPropertySet columnProperties, XConnection connection,
ISQLStatementHelper helper, String createPattern) throws SQLException {
try {
@@ -507,6 +571,12 @@ public class DbTools {
}
}
+ /** creates the standard sql statement for the key part of a create table statement.
+ * @param descriptor
+ * The descriptor of the new table.
+ * @param connection
+ * The connection.
+ */
public static String createStandardKeyStatement(XPropertySet descriptor, XConnection connection) throws SQLException {
try {
XDatabaseMetaData metadata = connection.getMetaData();
@@ -601,7 +671,17 @@ public class DbTools {
return sql.toString();
}
- /// We need some more information about the column.
+ /** collects the information about auto increment, currency and data type for the given column name.
+ * The column must be quoted, * is also valid.
+ * @param connection
+ * The connection.
+ * @param composedName
+ * The quoted table name. ccc.sss.ttt
+ * @param columnName
+ * The name of the column, or *
+ * @return
+ * The information about the column(s).
+ */
public static Map<String,ExtraColumnInfo> collectColumnInformation(XConnection connection, String composedName, String columnName) throws SQLException {
String sql = String.format("SELECT %s FROM %s WHERE 0 = 1", columnName, composedName);
XStatement statement = null;
@@ -632,6 +712,8 @@ public class DbTools {
}
}
+ /** returns the primary key columns of the table
+ */
public static XNameAccess getPrimaryKeyColumns(XPropertySet table) throws SQLException {
try {
XNameAccess keyColumns = null;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/SharedResources.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/SharedResources.java
index a1699b430e70..9f70be72bfc0 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/SharedResources.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/SharedResources.java
@@ -105,7 +105,7 @@ public class SharedResources {
@param _nResId
the resource ID of the string to load
@param _pAsciiPatternToReplace
- the ASCII string which is to search in the string. Must not be <NULL/>.
+ the ASCII string which is to search in the string. Must not be null.
@param _rStringToSubstitute
the String which should substitute the ASCII pattern.
@@ -129,11 +129,11 @@ public class SharedResources {
@param _nResId
the resource ID of the string to load
@param _pAsciiPatternToReplace1
- the ASCII string (1) which is to search in the string. Must not be <NULL/>.
+ the ASCII string (1) which is to search in the string. Must not be null.
@param _rStringToSubstitute1
the String which should substitute the ASCII pattern (1)
@param _pAsciiPatternToReplace2
- the ASCII string (2) which is to search in the string. Must not be <NULL/>.
+ 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)
@@ -160,15 +160,15 @@ public class SharedResources {
@param _nResId
the resource ID of the string to load
@param _pAsciiPatternToReplace1
- the ASCII string (1) which is to search in the string. Must not be <NULL/>.
+ the ASCII string (1) which is to search in the string. Must not be null.
@param _rStringToSubstitute1
the String which should substitute the ASCII pattern (1)
@param _pAsciiPatternToReplace2
- the ASCII string (2) which is to search in the string. Must not be <NULL/>.
+ 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)
@param _pAsciiPatternToReplace3
- the ASCII string (3) which is to search in the string. Must not be <NULL/>.
+ 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)
@@ -196,7 +196,7 @@ public class SharedResources {
@param _nResId
the resource ID of the string to load
- @param _aStringToSubstitutes
+ @param patternsAndSubstitutes
A list of substitutions.
@return
commit 4a0fac4b6f15fbf77705cc5bf6e94fedac041f66
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Aug 27 15:14:24 2017 +0000
Rearrange the directory structure, to resemble the C++ one.
Patch by: me
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java
index 43fd434f2037..1ca0b54f5a47 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java
@@ -37,7 +37,7 @@ import com.sun.star.sdbc.XDriver;
import com.sun.star.sdbc.XDriverManager;
import com.sun.star.sdbcx.XDataDefinitionSupplier;
import com.sun.star.sdbcx.XTablesSupplier;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.SharedResources;
+import com.sun.star.sdbcx.comp.postgresql.util.SharedResources;
import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OfficeResourceBundle.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/OfficeResourceBundle.java
similarity index 97%
rename from connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OfficeResourceBundle.java
rename to connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/OfficeResourceBundle.java
index c13dbce8feb5..027a282fa5bb 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OfficeResourceBundle.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/comphelper/OfficeResourceBundle.java
@@ -19,14 +19,13 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package com.sun.star.sdbcx.comp.postgresql.comphelper;
import com.sun.star.lang.NullPointerException;
import com.sun.star.resource.MissingResourceException;
import com.sun.star.resource.OfficeResourceLoader;
import com.sun.star.resource.XResourceBundle;
import com.sun.star.resource.XResourceBundleLoader;
-import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.XComponentContext;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
index 9f0ed55e2e04..a307b68abab6 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
@@ -54,6 +54,8 @@ import com.sun.star.sdbcx.XDataDescriptorFactory;
import com.sun.star.sdbcx.XDrop;
import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
import com.sun.star.sdbcx.comp.postgresql.comphelper.OEnumerationByIndex;
+import com.sun.star.sdbcx.comp.postgresql.util.Resources;
+import com.sun.star.sdbcx.comp.postgresql.util.SharedResources;
import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Type;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java
index 76d2859b715a..c07e711e3765 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java
@@ -26,8 +26,8 @@ import java.util.Collections;
import com.sun.star.beans.XPropertySet;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.Resources;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.SharedResources;
+import com.sun.star.sdbcx.comp.postgresql.util.Resources;
+import com.sun.star.sdbcx.comp.postgresql.util.SharedResources;
import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
public abstract class SdbcxDescriptorContainer extends OContainer {
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
index 1f235e66f417..59b4883909ea 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
@@ -54,10 +54,7 @@ import com.sun.star.sdbcx.XAppend;
import com.sun.star.sdbcx.XColumnsSupplier;
import com.sun.star.sdbcx.XKeysSupplier;
import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.ISQLStatementHelper;
import com.sun.star.sdbcx.comp.postgresql.sdbcx.OColumnContainer.ExtraColumnInfo;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.Resources;
-import com.sun.star.sdbcx.comp.postgresql.sdbcx.SharedResources;
import com.sun.star.uno.Any;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/ISQLStatementHelper.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/ISQLStatementHelper.java
similarity index 95%
rename from connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/ISQLStatementHelper.java
rename to connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/ISQLStatementHelper.java
index 831a0e5ca312..691a4c13b57b 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/ISQLStatementHelper.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/ISQLStatementHelper.java
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package com.sun.star.sdbcx.comp.postgresql.util;
import com.sun.star.beans.XPropertySet;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/Resources.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/Resources.java
similarity index 98%
rename from connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/Resources.java
rename to connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/Resources.java
index 2b904aba1f76..97b736782ce3 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/Resources.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/Resources.java
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package com.sun.star.sdbcx.comp.postgresql.util;
public class Resources {
public static final int STR_COMMON_BASE = 1200;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SharedResources.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/SharedResources.java
similarity index 98%
rename from connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SharedResources.java
rename to connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/SharedResources.java
index fa3e3660ba1c..a1699b430e70 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SharedResources.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/SharedResources.java
@@ -19,7 +19,7 @@
*
*************************************************************/
-package com.sun.star.sdbcx.comp.postgresql.sdbcx;
+package com.sun.star.sdbcx.comp.postgresql.util;
import java.util.List;
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.tuple.Pair;
import com.sun.star.lang.NullPointerException;
import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
+import com.sun.star.sdbcx.comp.postgresql.comphelper.OfficeResourceBundle;
import com.sun.star.uno.XComponentContext;
/**
commit 85d118e9487b38aa3465cf3f71fa1fc92781c4b3
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Aug 27 14:53:02 2017 +0000
It's a descriptor.
Patch by: me
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/ISQLStatementHelper.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/ISQLStatementHelper.java
index 52fbf7f466ca..831a0e5ca312 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/ISQLStatementHelper.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/ISQLStatementHelper.java
@@ -24,5 +24,5 @@ package com.sun.star.sdbcx.comp.postgresql.sdbcx;
import com.sun.star.beans.XPropertySet;
public interface ISQLStatementHelper {
- void addComment(XPropertySet propertySet, StringBuilder sql);
+ void addComment(XPropertySet descriptor, StringBuilder sql);
}
commit 346825de02b17b6756666e8c54d211c202f8f10a
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Aug 27 14:48:28 2017 +0000
Port some Javadoc to helper classes.
Don't use Java 8 only methods.
Patch by: me
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DBTypeConversion.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DBTypeConversion.java
index 943c78a15747..bcb5185b169c 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DBTypeConversion.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DBTypeConversion.java
@@ -21,6 +21,7 @@
package com.sun.star.sdbcx.comp.postgresql.util;
+import java.math.BigInteger;
import java.util.StringTokenizer;
import com.sun.star.util.Date;
@@ -81,6 +82,22 @@ public class DBTypeConversion {
return d;
}
+ public static int toUnsignedInt(byte value) {
+ return value & 0xff;
+ }
+
+ public static int toUnsignedInt(short value) {
+ return value & 0xffff;
+ }
+
+ public static String toUnsignedString(int value) {
+ return Long.toString(value & 0xffffFFFFL);
+ }
+
+ public static String toUnsignedString(long value) {
+ return new BigInteger(Long.toHexString(value), 16).toString();
+ }
+
public static void addDays(int nDays, Date _rDate) {
int nTempDays = implRelativeToAbsoluteNull( _rDate );
@@ -399,28 +416,31 @@ public class DBTypeConversion {
return new Time(nHundredthSeconds,nSecond,nMinute,nHour);
}
+ /// Return the date in the format %04d-%02d-%02d.
public static String toDateString(Date date) {
return String.format("%04d-%02d-%02d",
- Short.toUnsignedInt(date.Year),
- Short.toUnsignedInt(date.Month),
- Short.toUnsignedInt(date.Day));
+ toUnsignedInt(date.Year),
+ toUnsignedInt(date.Month),
+ toUnsignedInt(date.Day));
}
+ /// Return the time in the format %02d:%02d:%02d.
public static String toTimeString(Time time) {
return String.format("%02d:%02d:%02d",
- Short.toUnsignedInt(time.Hours),
- Short.toUnsignedInt(time.Minutes),
- Short.toUnsignedInt(time.Seconds));
+ toUnsignedInt(time.Hours),
+ toUnsignedInt(time.Minutes),
+ toUnsignedInt(time.Seconds));
}
+ /// Return the DateTime in the format %04d-%02d-%02d %02d:%02d:%02d.%d.
public static String toDateTimeString(DateTime dateTime) {
return String.format("%04d-%02d-%02d %02d:%02d:%02d.%d",
- Short.toUnsignedInt(dateTime.Year),
- Short.toUnsignedInt(dateTime.Month),
- Short.toUnsignedInt(dateTime.Day),
- Short.toUnsignedInt(dateTime.Hours),
- Short.toUnsignedInt(dateTime.Minutes),
- Short.toUnsignedInt(dateTime.Seconds),
- Short.toUnsignedInt(dateTime.HundredthSeconds));
+ toUnsignedInt(dateTime.Year),
+ toUnsignedInt(dateTime.Month),
+ toUnsignedInt(dateTime.Day),
+ toUnsignedInt(dateTime.Hours),
+ toUnsignedInt(dateTime.Minutes),
+ toUnsignedInt(dateTime.Seconds),
+ toUnsignedInt(dateTime.HundredthSeconds));
}
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
index 26a5ac18556c..1f235e66f417 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
@@ -604,6 +604,7 @@ public class DbTools {
return sql.toString();
}
+ /// We need some more information about the column.
public static Map<String,ExtraColumnInfo> collectColumnInformation(XConnection connection, String composedName, String columnName) throws SQLException {
String sql = String.format("SELECT %s FROM %s WHERE 0 = 1", columnName, composedName);
XStatement statement = null;
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/ORowSetValue.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/ORowSetValue.java
index f218b39b4cbd..f1c5489b9c8c 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/ORowSetValue.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/ORowSetValue.java
@@ -886,7 +886,7 @@ public class ORowSetValue {
aRet = (String)value;
break;
case DataType.BIGINT:
- aRet = isSigned() ? Long.toString((long)value) : Long.toUnsignedString((long)value);
+ aRet = isSigned() ? Long.toString((long)value) : DBTypeConversion.toUnsignedString((long)value);
break;
case DataType.FLOAT:
aRet = ((Float)value).toString();
@@ -911,7 +911,7 @@ public class ORowSetValue {
StringBuilder sVal = new StringBuilder("0x");
byte[] sSeq = getSequence();
for (byte b : sSeq) {
- sVal.append(String.format("%02x", Byte.toUnsignedInt(b)));
+ sVal.append(String.format("%02x", DBTypeConversion.toUnsignedInt(b)));
}
aRet = sVal.toString();
}
@@ -921,13 +921,13 @@ public class ORowSetValue {
aRet = ((Boolean)value).toString();
break;
case DataType.TINYINT:
- aRet = isSigned() ? Integer.toString((byte)value) : Integer.toUnsignedString(0xff & (byte)value);
+ aRet = isSigned() ? Integer.toString((byte)value) : DBTypeConversion.toUnsignedString(0xff & (byte)value);
break;
case DataType.SMALLINT:
- aRet = isSigned() ? Integer.toString((short)value) : Integer.toUnsignedString(0xffff & (short)value);
+ aRet = isSigned() ? Integer.toString((short)value) : DBTypeConversion.toUnsignedString(0xffff & (short)value);
break;
case DataType.INTEGER:
- aRet = isSigned() ? Integer.toString((int)value) : Integer.toUnsignedString((int)value);
+ aRet = isSigned() ? Integer.toString((int)value) : DBTypeConversion.toUnsignedString((int)value);
break;
case DataType.CLOB:
if (AnyConverter.isObject(value)) {
commit 12280f2267718bac0052c0d1781fdd64b8ed6316
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Aug 27 12:00:07 2017 +0000
Error handling cleanups.
Boxing into NameComponents cleanup.
Port findDataSource() and use it in isDataSourcePropertyEnabled().
Logging cleanup.
Patch by: me
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
index 7591f7974153..bcdbba001eda 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
@@ -26,7 +26,6 @@ import java.util.List;
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.IndexOutOfBoundsException;
import com.sun.star.lang.WrappedTargetException;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XDatabaseMetaData;
@@ -38,9 +37,9 @@ import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer;
import com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxTableDescriptor;
import com.sun.star.sdbcx.comp.postgresql.util.ComposeRule;
import com.sun.star.sdbcx.comp.postgresql.util.DbTools;
+import com.sun.star.sdbcx.comp.postgresql.util.DbTools.NameComponents;
import com.sun.star.sdbcx.comp.postgresql.util.PropertyIds;
import com.sun.star.sdbcx.comp.postgresql.util.StandardSQLState;
-import com.sun.star.sdbcx.comp.postgresql.util.DbTools.NameComponents;
import com.sun.star.uno.Any;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
@@ -105,11 +104,7 @@ public class PostgresqlTables extends OContainer {
CompHelper.disposeComponent(statement);
}
// FIXME: delete it from our views
- } catch (IllegalArgumentException illegalArgumentException) {
- throw new SQLException("Error", this, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, illegalArgumentException);
- } catch (UnknownPropertyException unknownPropertyException) {
- throw new SQLException("Error", this, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, unknownPropertyException);
- } catch (WrappedTargetException wrappedTargetException) {
+ } catch (IllegalArgumentException | UnknownPropertyException | WrappedTargetException wrappedTargetException) {
throw new SQLException("Error", this, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, wrappedTargetException);
}
}
@@ -136,14 +131,6 @@ public class PostgresqlTables extends OContainer {
String sql = DbTools.createSqlCreateTableStatement(descriptor, metadata.getConnection(), null, "(M,D)");
statement = metadata.getConnection().createStatement();
statement.execute(sql);
- } catch (IndexOutOfBoundsException indexOutOfBoundsException) {
- throw new SQLException("Error", this, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, indexOutOfBoundsException);
- } catch (IllegalArgumentException illegalArgumentException) {
- throw new SQLException("Error", this, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, illegalArgumentException);
- } catch (UnknownPropertyException unknownPropertyException) {
- throw new SQLException("Error", this, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, unknownPropertyException);
- } catch (WrappedTargetException wrappedTargetException) {
- throw new SQLException("Error", this, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, wrappedTargetException);
} finally {
CompHelper.disposeComponent(statement);
}
diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
index 5837c3e468ef..26a5ac18556c 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
@@ -24,24 +24,25 @@ package com.sun.star.sdbcx.comp.postgresql.util;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.commons.lang3.mutable.MutableObject;
-
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.PropertyVetoException;
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
import com.sun.star.beans.XPropertySetInfo;
import com.sun.star.container.ElementExistException;
+import com.sun.star.container.XChild;
import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameAccess;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.IndexOutOfBoundsException;
import com.sun.star.lang.WrappedTargetException;
+import com.sun.star.sdb.XOfficeDatabaseDocument;
import com.sun.star.sdbc.ColumnValue;
import com.sun.star.sdbc.DataType;
import com.sun.star.sdbc.KeyRule;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XConnection;
+import com.sun.star.sdbc.XDataSource;
import com.sun.star.sdbc.XDatabaseMetaData;
import com.sun.star.sdbc.XResultSet;
import com.sun.star.sdbc.XResultSetMetaData;
@@ -176,21 +177,18 @@ public class DbTools {
public static String composeTableName(
XDatabaseMetaData metadata, XPropertySet table, ComposeRule composeRule,
boolean suppressCatalog, boolean suppressSchema, boolean shouldQuote) throws SQLException {
- MutableObject<String> catalog = new MutableObject<>("");
- MutableObject<String> schema = new MutableObject<>("");
- MutableObject<String> name = new MutableObject<>("");
- getTableNameComponents(table, catalog, schema, name);
+ NameComponents nameComponents = getTableNameComponents(table);
return doComposeTableName(metadata,
- suppressCatalog ? "" : catalog.getValue(),
- suppressSchema ? "" : schema.getValue(),
- name.getValue(),
+ suppressCatalog ? "" : nameComponents.getCatalog(),
+ suppressSchema ? "" : nameComponents.getSchema(),
+ nameComponents.getTable(),
shouldQuote, composeRule);
}
public static boolean isDataSourcePropertyEnabled(Object object, String property, boolean defaultValue) throws SQLException {
try {
boolean enabled = defaultValue;
- XPropertySet properties = UnoRuntime.queryInterface(XPropertySet.class, object);
+ XPropertySet properties = UnoRuntime.queryInterface(XPropertySet.class, findDataSource(object));
if (properties != null) {
PropertyValue[] info = (PropertyValue[]) AnyConverter.toArray(properties.getPropertyValue("Info"));
for (PropertyValue propertyValue : info) {
@@ -201,18 +199,31 @@ public class DbTools {
}
}
return enabled;
- } catch (IllegalArgumentException illegalArgumentException) {
- throw new SQLException("Error", object, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, illegalArgumentException);
- } catch (WrappedTargetException wrappedTargetException) {
- throw new SQLException("Error", object, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, wrappedTargetException);
- } catch (UnknownPropertyException unknownPropertyException) {
- throw new SQLException("Error", object, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, unknownPropertyException);
+ } catch (IllegalArgumentException | WrappedTargetException | UnknownPropertyException exception) {
+ throw new SQLException("Error", object, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, exception);
+ }
+ }
+
+ public static XDataSource findDataSource(Object parent) {
+ XOfficeDatabaseDocument databaseDocument = UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, parent);
+ XDataSource dataSource = null;
+ if (databaseDocument != null) {
+ dataSource = databaseDocument.getDataSource();
+ }
+ if (dataSource == null) {
+ dataSource = UnoRuntime.queryInterface(XDataSource.class, parent);
+ }
+ if (dataSource == null) {
+ XChild child = UnoRuntime.queryInterface(XChild.class, parent);
+ if (child != null) {
+ dataSource = findDataSource(child.getParent());
+ }
}
+ return dataSource;
}
public static String doComposeTableName(XDatabaseMetaData metadata, String catalog, String schema, String table,
boolean shouldQuote, ComposeRule composeRule) throws SQLException {
- System.out.println(String.format("doComposeTableName(%s, %s, %s)\n", catalog, schema, table));
Osl.ensure(!table.isEmpty(), "At least the table name should be non-empty");
String quoteString = metadata.getIdentifierQuoteString();
NameComponentSupport nameComponentSupport = getNameComponentSupport(metadata, composeRule);
@@ -253,30 +264,27 @@ public class DbTools {
}
public static String composeTableNameForSelect(XConnection connection, XPropertySet table) throws SQLException {
- MutableObject<String> catalog = new MutableObject<>();
- MutableObject<String> schema = new MutableObject<>();
- MutableObject<String> tableName = new MutableObject<>();
- getTableNameComponents(table, catalog, schema, tableName);
- return composeTableNameForSelect(connection, catalog.getValue(), schema.getValue(), tableName.getValue());
+ NameComponents nameComponents = getTableNameComponents(table);
+ return composeTableNameForSelect(connection, nameComponents.getCatalog(), nameComponents.getSchema(), nameComponents.getTable());
}
- private static void getTableNameComponents(XPropertySet table, MutableObject<String> catalog,
- MutableObject<String> schema, MutableObject<String> tableName) {
+ private static NameComponents getTableNameComponents(XPropertySet table) throws SQLException {
try {
+ NameComponents nameComponents = new NameComponents();
XPropertySetInfo propertySetInfo = table.getPropertySetInfo();
if (propertySetInfo != null && propertySetInfo.hasPropertyByName(PropertyIds.NAME.name)) {
if (propertySetInfo.hasPropertyByName(PropertyIds.CATALOGNAME.name)
&& propertySetInfo.hasPropertyByName(PropertyIds.SCHEMANAME.name)) {
- catalog.setValue(AnyConverter.toString(table.getPropertyValue(PropertyIds.CATALOGNAME.name)));
- schema.setValue(AnyConverter.toString(table.getPropertyValue(PropertyIds.SCHEMANAME.name)));
+ nameComponents.setCatalog(AnyConverter.toString(table.getPropertyValue(PropertyIds.CATALOGNAME.name)));
+ nameComponents.setSchema(AnyConverter.toString(table.getPropertyValue(PropertyIds.SCHEMANAME.name)));
}
- tableName.setValue(AnyConverter.toString(table.getPropertyValue(PropertyIds.NAME.name)));
+ nameComponents.setTable(AnyConverter.toString(table.getPropertyValue(PropertyIds.NAME.name)));
} else {
- Osl.ensure(false, "not a table");
+ Osl.ensure(false, "this is not a table object");
}
- } catch (IllegalArgumentException illegalArgumentException) {
- } catch (WrappedTargetException wrappedTargetException) {
- } catch (UnknownPropertyException unknownPropertyException) {
+ return nameComponents;
+ } catch (IllegalArgumentException | WrappedTargetException | UnknownPropertyException exception) {
+ throw new SQLException("Error", Any.VOID, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, exception);
}
}
@@ -323,7 +331,7 @@ public class DbTools {
if ( aNameComps.useSchemas ) {
int nIndex = sName.indexOf('.');
- Osl.ensure(-1 != nIndex, "QualifiedNameComponents : no schema separator!");
+ //Osl.ensure(-1 != nIndex, "QualifiedNameComponents : no schema separator!");
if ( nIndex != -1 ) {
ret.setSchema(sName.substring(0, nIndex));
}
@@ -335,8 +343,7 @@ public class DbTools {
}
public static String createSqlCreateTableStatement(XPropertySet descriptor, XConnection connection,
- ISQLStatementHelper helper, String createPattern) throws
- SQLException, WrappedTargetException, UnknownPropertyException, IllegalArgumentException, IndexOutOfBoundsException {
+ ISQLStatementHelper helper, String createPattern) throws SQLException {
String sql = createStandardCreateStatement(descriptor, connection, helper, createPattern);
final String keyStatement = createStandardKeyStatement(descriptor, connection);
@@ -349,223 +356,231 @@ public class DbTools {
}
public static String createStandardCreateStatement(XPropertySet descriptor, XConnection connection,
- ISQLStatementHelper helper, String createPattern) throws
- SQLException, WrappedTargetException, UnknownPropertyException, IllegalArgumentException, IndexOutOfBoundsException {
-
- XDatabaseMetaData metadata = connection.getMetaData();
- String catalog = AnyConverter.toString(descriptor.getPropertyValue("CatalogName"));
- String schema = AnyConverter.toString(descriptor.getPropertyValue("SchemaName"));
- String table = AnyConverter.toString(descriptor.getPropertyValue("Name"));
- String composedName = composeTableName(metadata, catalog, schema, table, true, ComposeRule.InTableDefinitions);
- if (composedName.isEmpty()) {
- throw new SQLException(SharedResources.getInstance().getResourceString(Resources.STR_ERRORMSG_SEQUENCE), connection,
- StandardSQLState.SQL_FUNCTION_SEQUENCE_ERROR.text(), 0, null);
- }
+ ISQLStatementHelper helper, String createPattern) throws SQLException {
+ try {
+ XDatabaseMetaData metadata = connection.getMetaData();
+ String catalog = AnyConverter.toString(descriptor.getPropertyValue("CatalogName"));
+ String schema = AnyConverter.toString(descriptor.getPropertyValue("SchemaName"));
+ String table = AnyConverter.toString(descriptor.getPropertyValue("Name"));
+ String composedName = composeTableName(metadata, catalog, schema, table, true, ComposeRule.InTableDefinitions);
+ if (composedName.isEmpty()) {
+ throw new SQLException(SharedResources.getInstance().getResourceString(Resources.STR_ERRORMSG_SEQUENCE), connection,
+ StandardSQLState.SQL_FUNCTION_SEQUENCE_ERROR.text(), 0, null);
+ }
- XIndexAccess columns = null;
- XColumnsSupplier columnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, descriptor);
- if (columnsSupplier != null) {
- columns = UnoRuntime.queryInterface(XIndexAccess.class, columnsSupplier.getColumns());
- }
- if (columns == null || columns.getCount() <= 0) {
- throw new SQLException(SharedResources.getInstance().getResourceString(Resources.STR_ERRORMSG_SEQUENCE), connection,
- StandardSQLState.SQL_FUNCTION_SEQUENCE_ERROR.text(), 0, null);
- }
+ XIndexAccess columns = null;
+ XColumnsSupplier columnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, descriptor);
+ if (columnsSupplier != null) {
+ columns = UnoRuntime.queryInterface(XIndexAccess.class, columnsSupplier.getColumns());
+ }
+ if (columns == null || columns.getCount() <= 0) {
+ throw new SQLException(SharedResources.getInstance().getResourceString(Resources.STR_ERRORMSG_SEQUENCE), connection,
+ StandardSQLState.SQL_FUNCTION_SEQUENCE_ERROR.text(), 0, null);
+ }
- int columnCount = columns.getCount();
- StringBuilder columnText = new StringBuilder();
- String separator = "";
- for (int i = 0; i < columnCount; i++) {
- XPropertySet columnProperties;
- columnProperties = AnyConverter.toObject(XPropertySet.class, columns.getByIndex(i));
- if (columnProperties != null) {
- columnText.append(separator);
- separator = ",";
- columnText.append(createStandardColumnPart(columnProperties, connection, helper, createPattern));
+ int columnCount = columns.getCount();
+ StringBuilder columnText = new StringBuilder();
+ String separator = "";
+ for (int i = 0; i < columnCount; i++) {
+ XPropertySet columnProperties;
+ columnProperties = AnyConverter.toObject(XPropertySet.class, columns.getByIndex(i));
+ if (columnProperties != null) {
+ columnText.append(separator);
+ separator = ",";
+ columnText.append(createStandardColumnPart(columnProperties, connection, helper, createPattern));
+ }
}
- }
- return String.format("CREATE TABLE %s (%s", composedName, columnText.toString());
+ return String.format("CREATE TABLE %s (%s", composedName, columnText.toString());
+ } catch (IllegalArgumentException | WrappedTargetException | UnknownPropertyException | IndexOutOfBoundsException exception) {
+ throw new SQLException("Error", Any.VOID, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, exception);
+ }
}
public static String createStandardColumnPart(XPropertySet columnProperties, XConnection connection,
- ISQLStatementHelper helper, String createPattern) throws
- SQLException, WrappedTargetException, UnknownPropertyException, IllegalArgumentException, IndexOutOfBoundsException {
-
- XDatabaseMetaData metadata = connection.getMetaData();
-
- final String quoteString = metadata.getIdentifierQuoteString();
- final StringBuilder sql = new StringBuilder();
- sql.append(quoteName(quoteString, AnyConverter.toString(columnProperties.getPropertyValue("Name"))));
- sql.append(' ');
+ ISQLStatementHelper helper, String createPattern) throws SQLException {
+ try {
+ XDatabaseMetaData metadata = connection.getMetaData();
- String typename = AnyConverter.toString(columnProperties.getPropertyValue("TypeName"));
- int datatype = AnyConverter.toInt(columnProperties.getPropertyValue("Type"));
- int precision = AnyConverter.toInt(columnProperties.getPropertyValue("Precision"));
- int scale = AnyConverter.toInt(columnProperties.getPropertyValue("Scale"));
- boolean isAutoIncrement = AnyConverter.toBoolean(columnProperties.getPropertyValue("IsAutoIncrement"));
+ final String quoteString = metadata.getIdentifierQuoteString();
+ final StringBuilder sql = new StringBuilder();
+ sql.append(quoteName(quoteString, AnyConverter.toString(columnProperties.getPropertyValue("Name"))));
+ sql.append(' ');
- // check if the user enter a specific string to create autoincrement values
- String autoIncrementValue = "";
- XPropertySetInfo columnPropertiesInfo = columnProperties.getPropertySetInfo();
- if (columnPropertiesInfo != null && columnPropertiesInfo.hasPropertyByName("AutoIncrementCreation")) {
- autoIncrementValue = AnyConverter.toString(columnProperties.getPropertyValue("AutoIncrementCreation"));
- }
+ String typename = AnyConverter.toString(columnProperties.getPropertyValue("TypeName"));
+ int datatype = AnyConverter.toInt(columnProperties.getPropertyValue("Type"));
+ int precision = AnyConverter.toInt(columnProperties.getPropertyValue("Precision"));
+ int scale = AnyConverter.toInt(columnProperties.getPropertyValue("Scale"));
+ boolean isAutoIncrement = AnyConverter.toBoolean(columnProperties.getPropertyValue("IsAutoIncrement"));
+
+ // check if the user enter a specific string to create autoincrement values
+ String autoIncrementValue = "";
+ XPropertySetInfo columnPropertiesInfo = columnProperties.getPropertySetInfo();
+ if (columnPropertiesInfo != null && columnPropertiesInfo.hasPropertyByName("AutoIncrementCreation")) {
+ autoIncrementValue = AnyConverter.toString(columnProperties.getPropertyValue("AutoIncrementCreation"));
+ }
- // look if we have to use precisions
- boolean useLiteral = false;
- String prefix = "";
- String postfix ="";
- String createParams = "";
- XResultSet results = null;
- try {
- results = metadata.getTypeInfo();
- if (results != null) {
- XRow row = UnoRuntime.queryInterface(XRow.class, results);
- while (results.next()) {
- String typeName2Cmp = row.getString(1);
- int nType = row.getShort(2);
- prefix = row.getString(4);
- postfix = row.getString(5);
- createParams = row.getString(6);
- // first identical type will be used if typename is empty
- if (typename.isEmpty() && nType == datatype) {
- typename = typeName2Cmp;
- }
- if (typename.equals(typeName2Cmp) && nType == datatype && !row.wasNull() && !createParams.isEmpty()) {
- useLiteral = true;
- break;
+ // look if we have to use precisions
+ boolean useLiteral = false;
+ String prefix = "";
+ String postfix ="";
+ String createParams = "";
+ XResultSet results = null;
+ try {
+ results = metadata.getTypeInfo();
+ if (results != null) {
+ XRow row = UnoRuntime.queryInterface(XRow.class, results);
+ while (results.next()) {
+ String typeName2Cmp = row.getString(1);
+ int nType = row.getShort(2);
+ prefix = row.getString(4);
+ postfix = row.getString(5);
+ createParams = row.getString(6);
+ // first identical type will be used if typename is empty
+ if (typename.isEmpty() && nType == datatype) {
+ typename = typeName2Cmp;
+ }
+ if (typename.equalsIgnoreCase(typeName2Cmp) && nType == datatype && !row.wasNull() && !createParams.isEmpty()) {
+ useLiteral = true;
+ break;
+ }
}
}
+ } finally {
+ CompHelper.disposeComponent(results);
}
- } finally {
- CompHelper.disposeComponent(results);
- }
-
- int index = 0;
- if (!autoIncrementValue.isEmpty() && (index = typename.indexOf(autoIncrementValue)) != -1) {
- typename = typename.substring(0, index);
- }
- if ((precision > 0 || scale > 0) && useLiteral) {
- int parenPos = typename.indexOf('(');
- if (parenPos == -1) {
- sql.append(typename);
- sql.append('(');
- } else {
- sql.append(typename.substring(0, ++parenPos));
+ int index = 0;
+ if (!autoIncrementValue.isEmpty() && (index = typename.indexOf(autoIncrementValue)) != -1) {
+ typename = typename.substring(0, index);
}
- if (precision > 0 && datatype != DataType.TIMESTAMP) {
- sql.append(precision);
- if (scale > 0 || (!createPattern.isEmpty() && createParams.indexOf(createPattern) != -1)) {
- sql.append(',');
+ if ((precision > 0 || scale > 0) && useLiteral) {
+ int parenPos = typename.indexOf('(');
+ if (parenPos == -1) {
+ sql.append(typename);
+ sql.append('(');
+ } else {
+ sql.append(typename.substring(0, ++parenPos));
+ }
+
+ if (precision > 0 && datatype != DataType.TIMESTAMP) {
+ sql.append(precision);
+ if (scale > 0 || (!createPattern.isEmpty() && createParams.indexOf(createPattern) != -1)) {
+ sql.append(',');
+ }
+ }
+ if (scale > 0 || (!createPattern.isEmpty() && createParams.indexOf(createPattern) != -1) || datatype == DataType.TIMESTAMP) {
+ sql.append(scale);
+ }
+ if (parenPos == -1) {
+ sql.append(')');
+ } else {
+ parenPos = typename.indexOf(')', parenPos);
+ sql.append(typename.substring(parenPos));
}
- }
- if (scale > 0 || (!createPattern.isEmpty() && createParams.indexOf(createPattern) != -1) || datatype == DataType.TIMESTAMP) {
- sql.append(scale);
- }
- if (parenPos == -1) {
- sql.append(')');
} else {
- parenPos = typename.indexOf(')', parenPos);
- sql.append(typename.substring(parenPos));
+ sql.append(typename); // simply add the type name
}
- } else {
- sql.append(typename); // simply add the type name
- }
- String defaultValue = AnyConverter.toString(columnProperties.getPropertyValue("DefaultValue"));
- if (defaultValue != null && !defaultValue.isEmpty()) {
- sql.append(" DEFAULT ");
- sql.append(prefix);
- sql.append(defaultValue);
- sql.append(postfix);
- }
+ String defaultValue = AnyConverter.toString(columnProperties.getPropertyValue("DefaultValue"));
+ if (!defaultValue.isEmpty()) {
+ sql.append(" DEFAULT ");
+ sql.append(prefix);
+ sql.append(defaultValue);
+ sql.append(postfix);
+ }
- if (AnyConverter.toInt(columnProperties.getPropertyValue("IsNullable")) == ColumnValue.NO_NULLS) {
- sql.append(" NOT NULL");
- }
+ if (AnyConverter.toInt(columnProperties.getPropertyValue("IsNullable")) == ColumnValue.NO_NULLS) {
+ sql.append(" NOT NULL");
+ }
- if (isAutoIncrement && !autoIncrementValue.isEmpty()) {
- sql.append(' ');
- sql.append(autoIncrementValue);
- }
+ if (isAutoIncrement && !autoIncrementValue.isEmpty()) {
+ sql.append(' ');
+ sql.append(autoIncrementValue);
+ }
- if (helper != null) {
- helper.addComment(columnProperties, sql);
- }
+ if (helper != null) {
+ helper.addComment(columnProperties, sql);
+ }
- return sql.toString();
+ return sql.toString();
+ } catch (IllegalArgumentException | WrappedTargetException | UnknownPropertyException exception) {
+ throw new SQLException("Error", Any.VOID, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, exception);
+ }
}
- public static String createStandardKeyStatement(XPropertySet descriptor, XConnection connection) throws
- SQLException, WrappedTargetException, UnknownPropertyException, IllegalArgumentException, IndexOutOfBoundsException {
- XDatabaseMetaData metadata = connection.getMetaData();
- StringBuilder sql = new StringBuilder();
-
- XKeysSupplier keysSupplier = UnoRuntime.queryInterface(XKeysSupplier.class, descriptor);
- XIndexAccess keys = keysSupplier.getKeys();
- if (keys != null) {
- boolean hasPrimaryKey = false;
- for (int i = 0; i < keys.getCount(); i++) {
- XPropertySet columnProperties = AnyConverter.toObject(XPropertySet.class, keys.getByIndex(i));
- if (columnProperties != null) {
- int keyType = AnyConverter.toInt(columnProperties.getPropertyValue("Type"));
- XColumnsSupplier columnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, columnProperties);
- XIndexAccess columns = UnoRuntime.queryInterface(XIndexAccess.class, columnsSupplier.getColumns());
- if (columns == null || columns.getCount() == 0) {
- throw new SQLException(SharedResources.getInstance().getResourceString(Resources.STR_ERRORMSG_SEQUENCE), connection,
- StandardSQLState.SQL_FUNCTION_SEQUENCE_ERROR.text(), 0, null);
- }
- if (keyType == KeyType.PRIMARY) {
- if (hasPrimaryKey) {
- throw new SQLException(SharedResources.getInstance().getResourceString(Resources.STR_ERRORMSG_SEQUENCE), connection,
- StandardSQLState.SQL_FUNCTION_SEQUENCE_ERROR.text(), 0, null);
- }
- hasPrimaryKey = true;
- sql.append(" PRIMARY KEY ");
- sql.append(generateColumnNames(columns, metadata));
- } else if (keyType == KeyType.UNIQUE) {
- sql.append(" UNIQUE ");
- sql.append(generateColumnNames(columns, metadata));
- } else if (keyType == KeyType.FOREIGN) {
- int deleteRule = AnyConverter.toInt(columnProperties.getPropertyValue("DeleteRule"));
- sql.append(" FOREIGN KEY ");
- sql.append(generateColumnNames(columns, metadata));
-
- String referencedTable = AnyConverter.toString(columnProperties.getPropertyValue("ReferencedTable"));
- NameComponents nameComponents = qualifiedNameComponents(metadata, referencedTable, ComposeRule.InDataManipulation);
- String composedName = composeTableName(metadata, nameComponents.getCatalog(), nameComponents.getSchema(), nameComponents.getTable(),
- true, ComposeRule.InTableDefinitions);
- if (composedName.isEmpty()) {
+ public static String createStandardKeyStatement(XPropertySet descriptor, XConnection connection) throws SQLException {
+ try {
+ XDatabaseMetaData metadata = connection.getMetaData();
+ StringBuilder sql = new StringBuilder();
+
+ XKeysSupplier keysSupplier = UnoRuntime.queryInterface(XKeysSupplier.class, descriptor);
+ XIndexAccess keys = keysSupplier.getKeys();
+ if (keys != null) {
+ boolean hasPrimaryKey = false;
+ for (int i = 0; i < keys.getCount(); i++) {
+ XPropertySet columnProperties = AnyConverter.toObject(XPropertySet.class, keys.getByIndex(i));
+ if (columnProperties != null) {
+ int keyType = AnyConverter.toInt(columnProperties.getPropertyValue("Type"));
+ XColumnsSupplier columnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, columnProperties);
+ XIndexAccess columns = UnoRuntime.queryInterface(XIndexAccess.class, columnsSupplier.getColumns());
+ if (columns == null || columns.getCount() == 0) {
throw new SQLException(SharedResources.getInstance().getResourceString(Resources.STR_ERRORMSG_SEQUENCE), connection,
StandardSQLState.SQL_FUNCTION_SEQUENCE_ERROR.text(), 0, null);
}
+ if (keyType == KeyType.PRIMARY) {
+ if (hasPrimaryKey) {
+ throw new SQLException(SharedResources.getInstance().getResourceString(Resources.STR_ERRORMSG_SEQUENCE), connection,
+ StandardSQLState.SQL_FUNCTION_SEQUENCE_ERROR.text(), 0, null);
+ }
+ hasPrimaryKey = true;
+ sql.append(" PRIMARY KEY ");
+ sql.append(generateColumnNames(columns, metadata));
+ } else if (keyType == KeyType.UNIQUE) {
+ sql.append(" UNIQUE ");
+ sql.append(generateColumnNames(columns, metadata));
+ } else if (keyType == KeyType.FOREIGN) {
+ int deleteRule = AnyConverter.toInt(columnProperties.getPropertyValue("DeleteRule"));
+ sql.append(" FOREIGN KEY ");
+
+ String referencedTable = AnyConverter.toString(columnProperties.getPropertyValue("ReferencedTable"));
+ NameComponents nameComponents = qualifiedNameComponents(metadata, referencedTable, ComposeRule.InDataManipulation);
+ String composedName = composeTableName(metadata, nameComponents.getCatalog(), nameComponents.getSchema(), nameComponents.getTable(),
+ true, ComposeRule.InTableDefinitions);
+ if (composedName.isEmpty()) {
+ throw new SQLException(SharedResources.getInstance().getResourceString(Resources.STR_ERRORMSG_SEQUENCE), connection,
+ StandardSQLState.SQL_FUNCTION_SEQUENCE_ERROR.text(), 0, null);
+ }
- switch (deleteRule) {
- case KeyRule.CASCADE:
- sql.append(" ON DELETE CASCADE ");
- break;
- case KeyRule.RESTRICT:
- sql.append(" ON DELETE RESTRICT ");
- break;
- case KeyRule.SET_NULL:
- sql.append(" ON DELETE SET NULL ");
- break;
- case KeyRule.SET_DEFAULT:
- sql.append(" ON DELETE SET DEFAULT ");
- break;
+ sql.append(generateColumnNames(columns, metadata));
+
+ switch (deleteRule) {
+ case KeyRule.CASCADE:
+ sql.append(" ON DELETE CASCADE ");
+ break;
+ case KeyRule.RESTRICT:
+ sql.append(" ON DELETE RESTRICT ");
+ break;
+ case KeyRule.SET_NULL:
+ sql.append(" ON DELETE SET NULL ");
+ break;
+ case KeyRule.SET_DEFAULT:
+ sql.append(" ON DELETE SET DEFAULT ");
+ break;
+ }
}
}
}
}
- }
- if (sql.length() > 0) {
- sql.append(')');
+ if (sql.length() > 0) {
+ sql.append(')');
+ }
+ return sql.toString();
+ } catch (IllegalArgumentException | WrappedTargetException | UnknownPropertyException | IndexOutOfBoundsException exception) {
+ throw new SQLException("Error", Any.VOID, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, exception);
}
- return sql.toString();
}
private static String generateColumnNames(XIndexAccess columns, XDatabaseMetaData metadata) throws
@@ -612,14 +627,8 @@ public class DbTools {
columns.put(newColumnName, columnInfo);
}
return columns;
- } catch (IllegalArgumentException illegalArgumentException) {
- throw new SQLException();
- } catch (WrappedTargetException wrappedTargetException) {
- throw new SQLException();
- } catch (UnknownPropertyException unknownPropertyException) {
- throw new SQLException();
- } catch (PropertyVetoException propertyVetoException) {
- throw new SQLException();
+ } catch (IllegalArgumentException | WrappedTargetException | UnknownPropertyException | PropertyVetoException exception) {
+ throw new SQLException("Error", Any.VOID, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, exception);
} finally {
CompHelper.disposeComponent(statement);
}
@@ -648,14 +657,8 @@ public class DbTools {
}
}
return keyColumns;
- } catch (IndexOutOfBoundsException indexOutOfBoundsException) {
- throw new SQLException();
- } catch (IllegalArgumentException illegalArgumentException) {
- throw new SQLException();
- } catch (WrappedTargetException wrappedTargetException) {
- throw new SQLException();
- } catch (UnknownPropertyException unknownPropertyException) {
- throw new SQLException();
+ } catch (IndexOutOfBoundsException | IllegalArgumentException | WrappedTargetException | UnknownPropertyException exception) {
+ throw new SQLException("Error", Any.VOID, StandardSQLState.SQL_GENERAL_ERROR.text(), 0, exception);
}
}
commit 861e9fc13d3638e929e6468e8d30669652c7e1c5
Author: Matthias Seidel <mseidel at apache.org>
Date: Sat Aug 26 16:18:49 2017 +0000
#i127341# Updated English dictionary
diff --git a/extensions.lst b/extensions.lst
index 3630bf50c983..69a76d319204 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -39,7 +39,7 @@
# English dictionary
[ language=en.* || language=de || language=it ]
- 68d350b57775c0f1216cf4fbf44f4d50 https://sourceforge.net/projects/aoo-extensions/files/17102/35/dict-en-20170701.oxt/download "dict-en-20170701.oxt"
+ 78c5505c04bcd5a315b6dbd7ed91e8ec https://sourceforge.net/projects/aoo-extensions/files/17102/36/dict-en-20170901.oxt/download "dict-en-20170901.oxt"
# English (USA, en_US) dictionary
[ language==nl || language==ru ]
commit 03c01d765c9b1cd3d1fd107cc681fc835ae632ae
Author: Matthias Seidel <mseidel at apache.org>
Date: Fri Aug 25 16:24:13 2017 +0000
Removed branding and closed DlgLine
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index 0f422f275bc4..14e7bf2ef288 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -3,13 +3,13 @@ s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
AdminChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
AdminChangeFolder BannerLine Line 0 44 376 0 1
-AdminChangeFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-AdminChangeFolder Branding2 Text 3 228 130 13 65537 [ProductName]
+#AdminChangeFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+#AdminChangeFolder Branding2 Text 3 228 130 13 65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80 458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_5 Combo
AdminChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_6
-AdminChangeFolder DlgLine Line 134 234 243 0 1
+AdminChangeFolder DlgLine Line 0 234 376 0 1
AdminChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_7
AdminChangeFolder List DirectoryList 21 90 332 97 7 TARGETDIR TailText
AdminChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_9
@@ -20,12 +20,12 @@ AdminChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTRO
AdminNetworkLocation Back PushButton 164 243 66 17 3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 297 0 77 44 1 BannerBmp
AdminNetworkLocation BannerLine Line 0 44 376 0 1
-AdminNetworkLocation Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-AdminNetworkLocation Branding2 Text 3 228 130 13 65537 [ProductName]
+#AdminNetworkLocation Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+#AdminNetworkLocation Branding2 Text 3 228 130 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
-AdminNetworkLocation DlgLine Line 134 234 243 0 1
+AdminNetworkLocation DlgLine Line 0 234 376 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
@@ -45,13 +45,13 @@ CancelSetup Yes PushButton 62 57 66 17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17 3 OOO_CONTROL_32 Next
CustomerInformation Banner Bitmap 297 0 77 44 1 BannerBmp
CustomerInformation BannerLine Line 0 44 376 0 1
-CustomerInformation Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-CustomerInformation Branding2 Text 3 228 130 13 65537 [ProductName]
+#CustomerInformation Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+#CustomerInformation Branding2 Text 3 228 130 13 65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit
CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38
-CustomerInformation DlgLine Line 134 234 243 0 1
+CustomerInformation DlgLine Line 0 234 376 0 1
CustomerInformation DlgRadioGroupText Text 21 161 300 14 3 OOO_CONTROL_39
CustomerInformation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_40
CustomerInformation NameEdit Edit 21 63 237 17 3 USERNAME OOO_CONTROL_41 CompanyLabel
@@ -63,13 +63,13 @@ CustomerInformation SerialNumber MaskedEdit 21 138 237 17 2 ISX_SERIALNUM Radio
CustomSetup Back PushButton 164 243 66 17 3 OOO_CONTROL_46 Next
CustomSetup Banner Bitmap 297 0 77 44 1 BannerBmp
CustomSetup BannerLine Line 0 44 376 0 1
-CustomSetup Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-CustomSetup Branding2 Text 3 228 130 13 65537 [ProductName]
+#CustomSetup Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+#CustomSetup Branding2 Text 3 228 130 13 65537 [ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17 3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3 OOO_CONTROL_51 Back
CustomSetup DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_52
-CustomSetup DlgLine Line 134 234 243 0 1
+CustomSetup DlgLine Line 0 234 376 0 1
CustomSetup DlgText Text 9 51 360 10 3 OOO_CONTROL_53
CustomSetup DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_54
CustomSetup FeatureGroup GroupBox 235 67 131 120 1 OOO_CONTROL_55
@@ -82,10 +82,10 @@ CustomSetup Size Text 241 133 120 50 3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7 _BrowseProperty ChangeFolder
CustomSetupTips Banner Bitmap 297 0 77 44 1 BannerBmp
CustomSetupTips BannerLine Line 0 44 376 0 1
-CustomSetupTips Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-CustomSetupTips Branding2 Text 3 228 130 13 65537 [ProductName]
+#CustomSetupTips Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+#CustomSetupTips Branding2 Text 3 228 130 13 65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_64
-CustomSetupTips DlgLine Line 134 234 243 0 1
+CustomSetupTips DlgLine Line 0 234 376 0 1
CustomSetupTips DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_65
CustomSetupTips DontInstall Icon 21 155 24 24 5242881 DontInstallIco
CustomSetupTips DontInstallText Text 60 155 300 20 3 OOO_CONTROL_66
@@ -100,13 +100,13 @@ CustomSetupTips PartialText Text 60 130 300 20 3 OOO_CONTROL_73
DatabaseFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_74 Next
DatabaseFolder Banner Bitmap 297 0 77 44 1 BannerBmp
DatabaseFolder BannerLine Line 0 44 376 0 1
-DatabaseFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-DatabaseFolder Branding2 Text 3 228 130 13 65537 [ProductName]
+#DatabaseFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+#DatabaseFolder Branding2 Text 3 228 130 13 65537 [ProductName]
DatabaseFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_77 ChangeFolder
DatabaseFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_78 Back
DatabaseFolder DatabaseFolder Icon 21 52 24 24 5242881 OpenFolderIco
DatabaseFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_79
-DatabaseFolder DlgLine Line 134 234 243 0 1
+DatabaseFolder DlgLine Line 0 234 376 0 1
DatabaseFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_80
DatabaseFolder Location Text 57 65 240 40 3 _BrowseProperty OOO_CONTROL_81
DatabaseFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_82
@@ -114,13 +114,13 @@ DatabaseFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_83 Cancel
DestinationFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_84 Next
DestinationFolder Banner Bitmap 297 0 77 44 1 BannerBmp
DestinationFolder BannerLine Line 0 44 376 0 1
-DestinationFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
-DestinationFolder Branding2 Text 3 228 130 13 65537 [ProductName]
+#DestinationFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+#DestinationFolder Branding2 Text 3 228 130 13 65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 125 66 17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 112 24 24 5242881 OpenFolderIco
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list