[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/java
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
|3
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
|6
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
|3
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java
|4
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
| 135 --
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndex.java
|5
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexColumnContainer.java
|3
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexContainer.java
|5
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKey.java
|5
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyColumnContainer.java
|3
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyContainer.java
|6
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SqlTableHelper.java
|6
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxDescriptorContainer.java
|4
13 files changed, 92 insertions(+), 96 deletions(-)
New commits:
commit 827782b060326fd43080d610dd43025f9dc71d90
Author: Damjan Jovanovic
Date: Wed Sep 6 18:55:30 2017 +
Simplify the Java OContainer by requiring unique names, something C++
should probably also do as append and co check uniqueness explicitly.
This does however complicate the client code, as we have to throw
exceptions when we dedect duplication on the initial names we are
initialized with.
Patch by: me
diff --git
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
index 638b8f31c947..d9f400192494 100644
---
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
+++
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
@@ -24,6 +24,7 @@ package com.sun.star.sdbcx.comp.postgresql;
import java.util.ArrayList;
import java.util.List;
+import com.sun.star.container.ElementExistException;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XResultSet;
import com.sun.star.sdbc.XRow;
@@ -52,6 +53,7 @@ public class PostgresqlCatalog extends OCatalog {
names.add(name);
}
return new PostgresqlTables(lock, metadata, this, names);
+} catch (ElementExistException elementExistException) {
} catch (SQLException sqlException) {
} finally {
CompHelper.disposeComponent(results);
@@ -71,6 +73,7 @@ public class PostgresqlCatalog extends OCatalog {
names.add(name);
}
return new PostgresqlTables(lock, metadata, this, names);
+} catch (ElementExistException elementExistException) {
} catch (SQLException sqlException) {
} finally {
CompHelper.disposeComponent(results);
diff --git
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
index 426bded92625..c5a285c7514e 100644
---
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
+++
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
@@ -95,6 +95,8 @@ public class PostgresqlTable extends OTable {
try {
List columns = new
SqlTableHelper().readColumns(getConnection().getMetaData(), catalogName,
schemaName, getName());
return new OColumnContainer(lock, isCaseSensitive(), columns,
this, getConnection().getMetaData());
+} catch (ElementExistException elementExistException) {
+return null;
} catch (SQLException sqlException) {
return null;
}
@@ -105,6 +107,8 @@ public class PostgresqlTable extends OTable {
try {
List indexes = new
SqlTableHelper().readIndexes(getConnection().getMetaData(), catalogName,
schemaName, getName(), this);
return new OIndexContainer(lock, indexes, isCaseSensitive(), this);
+} catch
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - javaunohelper/com
javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2d382cef5450cf1593322184649257d3666cbbd8
Author: Damjan Jovanovic
Date: Fri Sep 8 02:17:19 2017 +
Fix a locking bug in our Java ComponentBase class, where after the
transition
to disposed, the relevant variables (bDisposed and bInDispose) are written
to
outside a synchronized block.
The equivalent C++ implementation in main/cppuhelper/source/implbase.cxx,
method WeakComponentImplHelperBase::dispose(), already does this.
Patch by: me
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
index 12e408fb09f1..2c2a3ed42c60 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
@@ -92,8 +92,11 @@ public class ComponentBase extends WeakBase implements
XComponent
{
// finally makes sure that the flags are set even if a
RuntimeException is thrown.
// That ensures that this function is only called once.
-bDisposed= true;
-bInDispose= false;
+synchronized (this)
+{
+bDisposed= true;
+bInDispose= false;
+}
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1963dc64554a8b64c229ddd72bc615f3e736731a
Author: Damjan Jovanovic
Date: Fri Sep 8 02:17:19 2017 +
Fix a locking bug in our Java ComponentBase class, where after the
transition
to disposed, the relevant variables (bDisposed and bInDispose) are written
to
outside a synchronized block.
The equivalent C++ implementation in main/cppuhelper/source/implbase.cxx,
method WeakComponentImplHelperBase::dispose(), already does this.
Patch by: me
(cherry picked from commit 2d382cef5450cf1593322184649257d3666cbbd8)
Change-Id: I6c3e2ef78bc3c945245fe9fb7b6b713eb83710be
Reviewed-on: https://gerrit.libreoffice.org/42189
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
index 783c1d0cfcc2..d886ef7020d5 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
@@ -87,8 +87,11 @@ public class ComponentBase extends WeakBase implements
XComponent
{
// finally makes sure that the flags are set even if a
RuntimeException is thrown.
// That ensures that this function is only called once.
-bDisposed= true;
-bInDispose= false;
+synchronized (this)
+{
+bDisposed= true;
+bInDispose= false;
+}
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - connectivity/java javaunohelper/com
/comp/postgresql/sdbcx/descriptors/SdbcxTableDescriptor.java
| 13 -
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DatabaseMetaDataResultSet.java
| 64 +++
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
| 15 -
javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
| 15 +
38 files changed, 242 insertions(+), 616 deletions(-)
New commits:
commit ce466910b4cf6766b261b4ad1b7f0ded75c0d81c
Author: Damjan Jovanovic
Date: Sun Sep 17 01:03:04 2017 +
There is no need to use Any.VOID when Java's null gets translated to it
automatically.
Patch by: me
diff --git
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
index ad66cf6de697..80039c7255c9 100644
---
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
+++
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
@@ -31,7 +31,6 @@ import com.sun.star.sdbc.XRow;
import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
import com.sun.star.sdbcx.comp.postgresql.sdbcx.OCatalog;
import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer;
-import com.sun.star.uno.Any;
import com.sun.star.uno.UnoRuntime;
public class PostgresqlCatalog extends OCatalog {
@@ -44,7 +43,7 @@ public class PostgresqlCatalog extends OCatalog {
XResultSet results = null;
try {
// Using { "VIEW", "TABLE", "%" } shows INFORMATION_SCHEMA and
others, but it also shows indexes :-(
-results = metadata.getTables(Any.VOID, "%", "%", new String[] {
"VIEW", "TABLE" });
+results = metadata.getTables(null, "%", "%", new String[] {
"VIEW", "TABLE" });
XRow row = UnoRuntime.queryInterface(XRow.class, results);
List names = new ArrayList<>();
while (results.next()) {
@@ -64,7 +63,7 @@ public class PostgresqlCatalog extends OCatalog {
public OContainer refreshViews() {
XResultSet results = null;
try {
-results = metadata.getTables(Any.VOID, "%", "%", new String[] {
"VIEW" });
+results = metadata.getTables(null, "%", "%", new String[] { "VIEW"
});
XRow row = UnoRuntime.queryInterface(XRow.class, results);
List names = new ArrayList<>();
while (results.next()) {
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 0da3d66ac64d..ed0f97d3cdf6 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
@@ -41,7 +41,6 @@ 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.uno.Any;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
@@ -58,7 +57,7 @@ public class PostgresqlTables extends OContainer {
@Override
public XPropertySet createObject(String name) throws SQLException {
NameComponents nameComponents =
DbTools.qualifiedNameComponents(metadata, name, ComposeRule.InDataManipulation);
-Object queryCatalog = nameComponents.getCatalog().isEmpty() ? Any.VOID
: nameComponents.getCatalog();
+Object queryCatalog = nameComponents.getCatalog().isEmpty() ? null :
nameComponents.getCatalog();
XPropertySet ret = null;
XResultSet results = null;
try {
diff --git
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SqlTableHelper.java
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SqlTableHelper.java
index 15da0af32b51..03e1459599aa 100644
---
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SqlTableHelper.java
+++
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SqlTableHelper.java
@@ -39,7 +39,6 @@ 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.Osl;
import com.sun.star.sdbcx
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - ridljar/com
ridljar/com/sun/star/uno/UnoRuntime.java | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit ce2712be6e755c50fb611430bc5899a9a80552dd
Author: Damjan Jovanovic
Date: Sun Aug 20 06:22:29 2017 +
i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliably
In the Java UNO bridge, UnoRuntime.generateOid() generated the
object-specific part of the OID using java.lang.Object.hashCode(),
which is only 32 bits long, and is commonly overriden and could thus
return values from an even smaller range, so OID collisions were quite
likely.
This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the
object-specific part of the OID, and store these in an object => oid
java.util.WeakHashMap, making OID collisions almost impossible.
Patch by: me
Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at
googlemail dot com)
(cherry picked from commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118)
Change-Id: I8e851a7a69ac2defefa15e9a00118d8f9fc0da95
Reviewed-on: https://gerrit.libreoffice.org/41576
Reviewed-by: Stephan Bergmann
Reviewed-by: Noel Grandin
Tested-by: Jenkins
(cherry picked from commit 3f84390f585cf71331a77ab5ca632cacaf3ad7b9)
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java
b/ridljar/com/sun/star/uno/UnoRuntime.java
index 4bedc275c451..2b70ed92ea8b 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -23,6 +23,8 @@ import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.UUID;
+import java.util.WeakHashMap;
import com.sun.star.lib.uno.typedesc.FieldDescription;
import com.sun.star.lib.uno.typedesc.TypeDescription;
@@ -106,7 +108,16 @@ public class UnoRuntime {
if (object instanceof IQueryInterface) {
oid = ((IQueryInterface) object).getOid();
}
-return oid == null ? object.hashCode() + oidSuffix : oid;
+if (oid == null) {
+synchronized (oidMap) {
+ oid = oidMap.get(object);
+ if (oid == null) {
+ oid = UUID.randomUUID().toString() + oidSuffix;
+ oidMap.put(object, oid);
+ }
+}
+}
+return oid;
}
/**
@@ -690,6 +701,7 @@ public class UnoRuntime {
private final IBridge bridge;
}
+private static final WeakHashMap oidMap = new
WeakHashMap();
private static final String uniqueKeyHostPrefix
= Integer.toString(new Object().hashCode(), 16) + ":";
private static final Object uniqueKeyLock = new Object();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - connectivity/java connectivity/source
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/sdbcx/OCatalog.java
|9 ++
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumn.java
| 29
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java
| 34 +-
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
|4 -
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndex.java
| 31 -
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OIndexColumn.java
| 29
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKey.java
| 26 +++
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OKeyColumn.java
| 29
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OTable.java
|8 +-
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxColumnDescriptor.java
| 29
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java
| 29
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxIndexDescriptor.java
| 29
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java
| 28 +++-
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxKeyDescriptor.java
| 29
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxTableDescriptor.java
| 29
connectivity/source/sdbcx/VColumn.cxx
|4 -
connectivity/source/sdbcx/VIndexColumn.cxx
|8 +-
connectivity/source/sdbcx/VKey.cxx
|4 -
connectivity/source/sdbcx/VKeyColumn.cxx
|4 -
20 files changed, 365 insertions(+), 29 deletions(-)
New commits:
commit 9e678c46ef60f5fb9f4e534f01275b2f1067389e
Author: Damjan Jovanovic
Date: Tue Sep 19 06:18:22 2017 +
Add support for adding and deleting columns in Java's SDBCX tables,
currently used by the PostgreSQL driver.
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 f37f68d3da7c..5ac10788385b 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
@@ -33,9 +33,13 @@ import com.sun.star.sdbc.ColumnValue;
import com.sun.star.sdbc.DataType;
import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XDatabaseMetaData;
+import com.sun.star.sdbc.XStatement;
+import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
import
com.sun.star.sdbcx.comp.postgresql.sdbcx.SqlTableHelper.ColumnDescription;
import
com.sun.star.sdbcx.comp.postgresql.sdbcx.descriptors.SdbcxColumnDescriptor;
+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.Osl;
import com.sun.star.uno.UnoRuntime;
public class OColumnContainer extends OContainer {
@@ -116,10 +120,38 @@ public class OColumnContainer extends OContainer {
@Override
protected XPropertySet appendObject(String _rForName, XPropertySet
descriptor) throws SQLException {
-return null;
+if (table == null) {
+return cloneDescriptor(descriptor);
+}
+String sql = String.format("ALTER TABLE %s ADD %s",
+DbTools.composeTableName(metadata, table,
ComposeRule.InTableDefinitions, false, false, true),
+DbTools.createStandardColumnPart(descriptor,
table.getConnection(), null, table.getTypeCreatePattern()));
+XStatement statement = null;
+try {
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/java
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumn.java
|6 -
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java
| 38 ++
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/descriptors/SdbcxColumnDescriptor.java
|6 -
3 files changed, 31 insertions(+), 19 deletions(-)
New commits:
commit 268b9efd71b0c1799f7d76bb10962c6904768679
Author: Damjan Jovanovic
Date: Tue Sep 19 23:31:29 2017 +
When an unknown column is passed to ColumnContainer, which it will be when
a new column is created, re-read it from the database.
Strings in UNO can't be null. Ensure this is the case in Column and
SdbcxColumnDescriptor.
Patch by: me
diff --git
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumn.java
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumn.java
index aad4d3182f83..4149c1b2c55e 100644
---
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumn.java
+++
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumn.java
@@ -40,9 +40,9 @@ public class OColumn extends ODescriptor implements XNamed,
XDataDescriptorFacto
"com.sun.star.sdbcx.Column"
};
-private String typeName;
-private String description;
-private String defaultValue;
+private String typeName = "";
+private String description = "";
+private String defaultValue = "";
private int isNullable;
private int precision;
private int scale;
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 5ac10788385b..67f0162f2755 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
@@ -79,6 +79,23 @@ public class OColumnContainer extends OContainer {
boolean isAutoIncrement = false;
boolean isCurrency = false;
int dataType = DataType.OTHER;
+
+ColumnDescription columnDescription = columnDescriptions.get(name);
+if (columnDescription == null) {
+// could be a recently added column. Refresh:
+List newColumns = new
SqlTableHelper().readColumns(metadata, table.catalogName, table.schemaName,
table.getName());
+for (ColumnDescription newColumnDescription : newColumns) {
+if (newColumnDescription.columnName.equals(name)) {
+columnDescriptions.put(name, newColumnDescription);
+break;
+}
+}
+columnDescription = columnDescriptions.get(name);
+}
+if (columnDescription == null) {
+throw new SQLException("No column " + name + " found");
+}
+
ExtraColumnInfo columnInfo = extraColumnInfo.get(name);
if (columnInfo == null) {
String composedName =
DbTools.composeTableNameForSelect(metadata.getConnection(), table);
@@ -91,20 +108,15 @@ public class OColumnContainer extends OContainer {
isCurrency = columnInfo.isCurrency;
dataType = columnInfo.dataType;
}
-ColumnDescription columnDescription = columnDescriptions.get(name);
-if (columnDescription != null) {
-XNameAccess primaryKeyColumns =
DbTools.getPrimaryKeyColumns(UnoRuntime.queryInterface(XPropertySet.class,
table));
-int nullable = columnDescription.nullable;
-if (nullable != ColumnValue.NO_NULLS && primaryKeyColumns != null
&& primaryKeyColumns.hasByName(name)) {
-nullable = ColumnValue.NO_NULLS;
-}
-return new OColumn(name, columnDescription.typeName,
columnDescription.defaultValue, columnDescription.remarks,
-nullable, columnDescription.columnSize,
columnDescription.decimalDigits, columnDescription.type,
-isAutoIncrement, false, isCurrency, isCaseSensitive());
-} else {
-// FIXME: do something like the C++ implementation does?
-throw new SQLException();
+
+XNameAccess primaryKeyColumns =
DbTools.getPrimaryKeyColumns(UnoRuntime.queryInterface(XPropertySet.class,
table));
+int nullable = columnDescription.nullable;
+if (nullable != ColumnValue.NO_NULLS && primaryKeyColumns != null &&
primaryKeyColumns.hasByName(name)) {
+nullable = ColumnValue.NO_NULLS;
}
+return new OCo
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/java
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
|5 -
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
|5 -
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java
| 20 ++
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OColumnContainer.java
|1
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OContainer.java
| 32 +-
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OTable.java
|4 -
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/SqlTableHelper.java
| 17 ++---
connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/util/DbTools.java
| 15 ++--
8 files changed, 64 insertions(+), 35 deletions(-)
New commits:
commit 91af6fa89dd7eee302c59fcf110c3c19e157ab35
Author: Damjan Jovanovic
Date: Wed Sep 20 05:10:08 2017 +
Revert r1808599; apparently we really do need Any.VOID instead of Java's
null. Also fix one more place where this is the problem.
(I wonder why. Seems like something that could be improved.)
Fix "Refresh Tables", which was making all tables disappear. Apparently
we needed to actually re-read our tables, and deal with the fact that the
OCatalog is disposed after the return. Further development is ongoing.
Also make other null strings into empty strings like UNO requires.
Patch by: me
diff --git
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
index 80039c7255c9..ad66cf6de697 100644
---
a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
+++
b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
@@ -31,6 +31,7 @@ import com.sun.star.sdbc.XRow;
import com.sun.star.sdbcx.comp.postgresql.comphelper.CompHelper;
import com.sun.star.sdbcx.comp.postgresql.sdbcx.OCatalog;
import com.sun.star.sdbcx.comp.postgresql.sdbcx.OContainer;
+import com.sun.star.uno.Any;
import com.sun.star.uno.UnoRuntime;
public class PostgresqlCatalog extends OCatalog {
@@ -43,7 +44,7 @@ public class PostgresqlCatalog extends OCatalog {
XResultSet results = null;
try {
// Using { "VIEW", "TABLE", "%" } shows INFORMATION_SCHEMA and
others, but it also shows indexes :-(
-results = metadata.getTables(null, "%", "%", new String[] {
"VIEW", "TABLE" });
+results = metadata.getTables(Any.VOID, "%", "%", new String[] {
"VIEW", "TABLE" });
XRow row = UnoRuntime.queryInterface(XRow.class, results);
List names = new ArrayList<>();
while (results.next()) {
@@ -63,7 +64,7 @@ public class PostgresqlCatalog extends OCatalog {
public OContainer refreshViews() {
XResultSet results = null;
try {
-results = metadata.getTables(null, "%", "%", new String[] { "VIEW"
});
+results = metadata.getTables(Any.VOID, "%", "%", new String[] {
"VIEW" });
XRow row = UnoRuntime.queryInterface(XRow.class, results);
List names = new ArrayList<>();
while (results.next()) {
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 ed0f97d3cdf6..885cca5cdc3b 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
@@ -41,6 +41,7 @@ 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.uno.Any;
import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
@@ -57,7 +58,7 @@ public class PostgresqlTables extends OContainer {
@Override
public XPropertySet createObject(String name) throws SQLException {
NameComponents nameComponents =
DbTools.qualifiedNameComponents(metadata, name, ComposeRule.InDataManipulation);
-Object queryCatalog = nameComponents.getCatalog().isEmpty() ? null :
nameComponents.getCatalog();
+Object queryCatalog = nameComponents.get
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/sdbcx/VIndexColumn.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit d6e8e522a396f97f71a92d9b5d7e03947a4ad803
Author: Damjan Jovanovic
Date: Tue Sep 19 02:02:42 2017 +
Fix a typo in the XServiceInfo implementation
for main/connectivity/source/sdbcx/VIndexColumn.cxx.
It's implementation/service names are com.sun.star.sdbcx.VIndexColumn and
com.sun.star.sdbcx.IndexColumn, not com.sun.star.sdbcx.VIndex and
com.sun.star.sdbcx.Index.
Patch by: me
(cherry picked from commit d2f0e14de2a52180ed84c0402e47a0de16589203)
Change-Id: Ie8a8bead7f7b5dd2c655603a7355bc0b2678ef7e
Reviewed-on: https://gerrit.libreoffice.org/42534
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx
b/connectivity/source/sdbcx/VIndexColumn.cxx
index 6de4ad4dbf9b..957c607a536c 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -30,7 +30,7 @@ OUString SAL_CALL OIndexColumn::getImplementationName( )
{
if(isNew())
return OUString("com.sun.star.sdbcx.VIndexColumnDescription");
-return OUString("com.sun.star.sdbcx.VIndex");
+return OUString("com.sun.star.sdbcx.VIndexColumn");
}
css::uno::Sequence< OUString > SAL_CALL
OIndexColumn::getSupportedServiceNames( )
@@ -39,8 +39,7 @@ css::uno::Sequence< OUString > SAL_CALL
OIndexColumn::getSupportedServiceNames(
if(isNew())
aSupported[0] = "com.sun.star.sdbcx.IndexDescription";
else
-aSupported[0] = "com.sun.star.sdbcx.Index";
-
+aSupported[0] = "com.sun.star.sdbcx.IndexColumn";
return aSupported;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/sdbcx/VColumn.cxx |4 ++--
connectivity/source/sdbcx/VIndexColumn.cxx |4 ++--
connectivity/source/sdbcx/VKey.cxx |4 ++--
connectivity/source/sdbcx/VKeyColumn.cxx |4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 7d6a17e4b1451610011d23fe9286ba54c0c9bd15
Author: Damjan Jovanovic
Date: Tue Sep 19 02:16:41 2017 +
More naming errors. There are no "Descriptions" in the SDBCX module,
there are only "Descriptors".
Patch by: me
(cherry picked from commit ccc4532f9ed95f4460941e2762ae3250d37805f5)
Change-Id: Ifd4f34c7b1ba64b449222dc864a38df80f4c6727
Reviewed-on: https://gerrit.libreoffice.org/42535
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/connectivity/source/sdbcx/VColumn.cxx
b/connectivity/source/sdbcx/VColumn.cxx
index 1114f81ce9d6..32064d8034c8 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::sdbc;
OUString SAL_CALL OColumn::getImplementationName( )
{
if(isNew())
-return OUString("com.sun.star.sdbcx.VColumnDescription");
+return OUString("com.sun.star.sdbcx.VColumnDescriptor");
return OUString("com.sun.star.sdbcx.VColumn");
}
@@ -44,7 +44,7 @@ css::uno::Sequence< OUString > SAL_CALL
OColumn::getSupportedServiceNames( )
{
css::uno::Sequence< OUString > aSupported(1);
if(isNew())
-aSupported[0] = "com.sun.star.sdbcx.ColumnDescription";
+aSupported[0] = "com.sun.star.sdbcx.ColumnDescriptor";
else
aSupported[0] = "com.sun.star.sdbcx.Column";
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx
b/connectivity/source/sdbcx/VIndexColumn.cxx
index 957c607a536c..2dd54116405b 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno;
OUString SAL_CALL OIndexColumn::getImplementationName( )
{
if(isNew())
-return OUString("com.sun.star.sdbcx.VIndexColumnDescription");
+return OUString("com.sun.star.sdbcx.VIndexColumnDescriptor");
return OUString("com.sun.star.sdbcx.VIndexColumn");
}
@@ -37,7 +37,7 @@ css::uno::Sequence< OUString > SAL_CALL
OIndexColumn::getSupportedServiceNames(
{
css::uno::Sequence< OUString > aSupported(1);
if(isNew())
-aSupported[0] = "com.sun.star.sdbcx.IndexDescription";
+aSupported[0] = "com.sun.star.sdbcx.IndexColumnDescriptor";
else
aSupported[0] = "com.sun.star.sdbcx.IndexColumn";
return aSupported;
diff --git a/connectivity/source/sdbcx/VKey.cxx
b/connectivity/source/sdbcx/VKey.cxx
index 2f1de9327912..39e9bdb84c02 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::lang;
OUString SAL_CALL OKey::getImplementationName( )
{
if(isNew())
-return OUString("com.sun.star.sdbcx.VKeyDescription");
+return OUString("com.sun.star.sdbcx.VKeyDescriptor");
return OUString("com.sun.star.sdbcx.VKey");
}
@@ -47,7 +47,7 @@ css::uno::Sequence< OUString > SAL_CALL
OKey::getSupportedServiceNames( )
{
css::uno::Sequence< OUString > aSupported(1);
if(isNew())
-aSupported[0] = "com.sun.star.sdbcx.KeyDescription";
+aSupported[0] = "com.sun.star.sdbcx.KeyDescriptor";
else
aSupported[0] = "com.sun.star.sdbcx.Key";
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx
b/connectivity/source/sdbcx/VKeyColumn.cxx
index d06136bebd3b..e01994730e5f 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -30,7 +30,7 @@ using namespace cppu;
OUString SAL_CALL OKeyColumn::getImplementationName( )
{
if(isNew())
-return OUString("com.sun.star.sdbcx.VKeyColumnDescription");
+return OUString("com.sun.star.sdbcx.VKeyColumnDescriptor");
return OUString("com.sun.star.sdbcx.VKeyColumn");
}
@@ -38,7 +38,7 @@ css::uno::Sequence< OUString > SAL_CALL
OKeyColumn::getSupportedServiceNames( )
{
css::uno::Sequence< OUString > aSupported(1);
if(isNew())
-aSupported[0] = "com.sun.star.sdbcx.KeyColumnDescription";
+aSupported[0] = "com.sun.star.sdbcx.KeyColumnDescriptor";
else
aSupported[0] = "com.sun.star.sdbcx.KeyColumn";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scripting/source
scripting/source/provider/ProviderCache.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 275753a7d08086b084452ca00372003f1d8700d4
Author: Damjan Jovanovic
Date: Sun Oct 16 16:32:08 2016 +
#i127165# Clicking "No" in Java dialog causes abnormal exit on FreeBSD
XSingleComponentFactory::createInstanceWithArgumentsAndContext()
throws an Exception, not a RuntimeException. This was causing
an abort on FreeBSD when "No" is clicked in the Java dialog,
as JavaComponentLoader::activate() throws a
CannotActivateFactoryException which is a subclass of Exception
but not RuntimeException, and the scripting ProviderCache wrongly
catches only RuntimeException. The missed CannotActivateFactoryException
was going to unexpected(), which calls abort()...
Patch by: me
diff --git a/scripting/source/provider/ProviderCache.cxx
b/scripting/source/provider/ProviderCache.cxx
index 0049200..d7df63e 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -200,7 +200,7 @@ ProviderCache::createProvider( ProviderDetails& details )
throw ( RuntimeExcepti
details.provider.set(
details.factory->createInstanceWithArgumentsAndContext( m_Sctx,
m_xContext ), UNO_QUERY_THROW );
}
-catch ( RuntimeException& e )
+catch ( Exception& e )
{
::rtl::OUString temp =
::rtl::OUString::createFromAscii("ProviderCache::createProvider() Error
creating provider from factory!!!");
throw RuntimeException( temp.concat( e.Message ), Reference<
XInterface >() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ucbhelper/source
ucbhelper/source/provider/resultsethelper.cxx | 45 --
1 file changed, 28 insertions(+), 17 deletions(-)
New commits:
commit cea03b42ca0e2cd4d93c01879dec388295b8f771
Author: Damjan Jovanovic
Date: Tue Oct 18 17:52:44 2016 +
#i125868# AOO crashes if JRE (Java) is not installed (using help search or
picture/makros)
ucbhelper::ResultSetHelper methods calling init() can only throw
RuntimeException, yet Exception or its other subclasses are
thrown in some cases (eg. with Java disabled, try searching
the Help index), resulting in unexpected() on at least FreeBSD
and MacOS that crashes AOO.
Fix this by catching Exception and instead throwing a
RuntimeException with its message.
Patch by: me
diff --git a/ucbhelper/source/provider/resultsethelper.cxx
b/ucbhelper/source/provider/resultsethelper.cxx
index 4cde2c4..08cc0b3 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -298,27 +298,38 @@ void ResultSetImplHelper::init( sal_Bool bStatic )
if ( !m_bInitDone )
{
-if ( bStatic )
+try
{
-// virtual... derived class fills m_xResultSet1
-initStatic();
-
-OSL_ENSURE( m_xResultSet1.is(),
-"ResultSetImplHelper::init - No 1st result set!" );
-m_bStatic = sal_True;
+if ( bStatic )
+{
+// virtual... derived class fills m_xResultSet1
+initStatic();
+
+OSL_ENSURE( m_xResultSet1.is(),
+"ResultSetImplHelper::init - No 1st result set!" );
+m_bStatic = sal_True;
+}
+else
+{
+// virtual... derived class fills m_xResultSet1 and
m_xResultSet2
+initDynamic();
+
+OSL_ENSURE( m_xResultSet1.is(),
+"ResultSetImplHelper::init - No 1st result set!" );
+OSL_ENSURE( m_xResultSet2.is(),
+"ResultSetImplHelper::init - No 2nd result set!" );
+m_bStatic = sal_False;
+}
+m_bInitDone = sal_True;
+}
+catch ( uno::RuntimeException const &runtimeException )
+{
+throw runtimeException;
}
-else
+catch ( uno::Exception const &exception )
{
-// virtual... derived class fills m_xResultSet1 and m_xResultSet2
-initDynamic();
-
-OSL_ENSURE( m_xResultSet1.is(),
-"ResultSetImplHelper::init - No 1st result set!" );
-OSL_ENSURE( m_xResultSet2.is(),
-"ResultSetImplHelper::init - No 2nd result set!" );
-m_bStatic = sal_False;
+throw uno::RuntimeException( exception.Message, uno::Reference<
XInterface >() );
}
-m_bInitDone = sal_True;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/source
sfx2/source/bastyp/mieclip.cxx | 23 ++-
1 file changed, 18 insertions(+), 5 deletions(-)
New commits:
commit ae698a63b640b708a41022fdc39ef8ec7c76d3cd
Author: Damjan Jovanovic
Date: Thu Oct 20 15:47:11 2016 +
#i83004# cannot paste HTML data from any Java application via clipboard
Allow StartHTML and EndHTML values in the Windows clipboard's
"HTML Format" to be -1, and use StartFragment and EndFragment instead
when they are. Excel allows -1, as does Mozilla since 2011, so we
really should too. Java has been providing >= 0 for a while now, but
we should still support -1 in case any other applications use it.
Patch by: me
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index bcea749..8a7038b 100644
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -44,7 +44,8 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
delete pStrm, pStrm = 0;
ByteString sLine, sVersion;
-sal_uIntPtr nStt = 0, nEnd = 0;
+sal_Int32 nStt = -1, nEnd = -1;
+sal_Int32 nStartFragment = 0, nEndFragment = 0;
sal_uInt16 nIndex = 0;
rStream.Seek(STREAM_SEEK_TO_BEGIN);
@@ -59,14 +60,26 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream&
rStream )
nIndex = 0;
ByteString sTmp( sLine.GetToken( 0, ':', nIndex ) );
if( sTmp == "StartHTML" )
-nStt = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
+nStt = sLine.Erase( 0, nIndex ).ToInt32();
else if( sTmp == "EndHTML" )
-nEnd = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
+nEnd = sLine.Erase( 0, nIndex ).ToInt32();
+else if( sTmp == "StartFragment" )
+{
+nStartFragment = sLine.Erase( 0, nIndex ).ToInt32();
+if( nStt == -1 )
+nStt = nStartFragment;
+}
+else if( sTmp == "EndFragment" )
+{
+nEndFragment = sLine.Erase( 0, nIndex ).ToInt32();
+if (nEnd == -1 )
+nEnd = nEndFragment;
+}
else if( sTmp == "SourceURL" )
sBaseURL = String( sLine.Erase( 0, nIndex ),
RTL_TEXTENCODING_UTF8);
-if( nEnd && nStt &&
-( sBaseURL.Len() || rStream.Tell() >= nStt ))
+if( nEnd >= 0 && nStt >= 0 &&
+( sBaseURL.Len() || rStream.Tell() >= (sal_uInt32)nStt ))
{
bRet = sal_True;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - stoc/source
stoc/source/javavm/javavm.cxx | 24 +++-
1 file changed, 11 insertions(+), 13 deletions(-)
New commits:
commit 41b5e943aebdd661198311103775e9edc300572e
Author: Damjan Jovanovic
Date: Thu Oct 20 16:34:44 2016 +
#i80654# Java locale is set based on UI language rather than locale setting
Construct Java's language from the "User interface" language, and Java's
country from the "Locale setting" country in the "Language settings" ->
"Languages" options. This way, the user interface language will be the same
in AOO and Java, while the locale settings in Java won't depend on that
language but rather on the country.
This should fix the bug in Java, BeanShell, and Javascript.
Patch by: me
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index b205c72..bfb62b6 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -421,28 +421,26 @@ void getDefaultLocaleFromConfig(
css::uno::Reference xRegistryRootKey =
xConfRegistry_simple->getRootKey();
// read locale
-css::uno::Reference locale =
xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale")));
-if(locale.is() && locale->getStringValue().getLength()) {
-rtl::OUString language;
-rtl::OUString country;
-
-sal_Int32 index = locale->getStringValue().indexOf((sal_Unicode) '-');
-
+css::uno::Reference ooLocale =
xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale")));
+css::uno::Reference ooSetupSystemLocale =
xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooSetupSystemLocale")));
+if(ooLocale.is() && ooLocale->getStringValue().getLength()) {
+sal_Int32 index = ooLocale->getStringValue().indexOf((sal_Unicode)
'-');
if(index >= 0) {
-language = locale->getStringValue().copy(0, index);
-country = locale->getStringValue().copy(index + 1);
-
+rtl::OUString language = ooLocale->getStringValue().copy(0, index);
if(language.getLength()) {
rtl::OUString
prop(RTL_CONSTASCII_USTRINGPARAM("user.language="));
prop += language;
-
pjvm->pushProp(prop);
}
-
+}
+}
+if(ooSetupSystemLocale.is() &&
ooSetupSystemLocale->getStringValue().getLength()) {
+sal_Int32 index =
ooSetupSystemLocale->getStringValue().indexOf((sal_Unicode) '-');
+if(index >= 0) {
+rtl::OUString country =
ooSetupSystemLocale->getStringValue().copy(index + 1);
if(country.getLength()) {
rtl::OUString
prop(RTL_CONSTASCII_USTRINGPARAM("user.country="));
prop += country;
-
pjvm->pushProp(prop);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - stoc/source
stoc/source/javavm/javavm.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit d61ab2b5a0e35d55cb001e139be791420245bf35
Author: Damjan Jovanovic
Date: Thu Oct 20 18:19:18 2016 +
#i86470# Wrong Java locale when using the languagepacks "nl" and "fr"
Languages don't always have a country; if there is no "-" separating
language and country in the ooLocale registry value, use the entire
value as the language.
Patch by: me
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index bfb62b6..efebe5c 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -424,14 +424,17 @@ void getDefaultLocaleFromConfig(
css::uno::Reference ooLocale =
xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooLocale")));
css::uno::Reference ooSetupSystemLocale =
xRegistryRootKey->openKey(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("L10N/ooSetupSystemLocale")));
if(ooLocale.is() && ooLocale->getStringValue().getLength()) {
+rtl::OUString language;
sal_Int32 index = ooLocale->getStringValue().indexOf((sal_Unicode)
'-');
if(index >= 0) {
-rtl::OUString language = ooLocale->getStringValue().copy(0, index);
-if(language.getLength()) {
-rtl::OUString
prop(RTL_CONSTASCII_USTRINGPARAM("user.language="));
-prop += language;
-pjvm->pushProp(prop);
-}
+language = ooLocale->getStringValue().copy(0, index);
+} else {
+language = ooLocale->getStringValue();
+}
+if(language.getLength()) {
+rtl::OUString prop(RTL_CONSTASCII_USTRINGPARAM("user.language="));
+prop += language;
+pjvm->pushProp(prop);
}
}
if(ooSetupSystemLocale.is() &&
ooSetupSystemLocale->getStringValue().getLength()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ridljar/com
ridljar/com/sun/star/uno/UnoRuntime.java | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118
Author: Damjan Jovanovic
Date: Sun Aug 20 06:22:29 2017 +
#i32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliably
In the Java UNO bridge, UnoRuntime.generateOid() generated the
object-specific part of the OID using java.lang.Object.hashCode(),
which is only 32 bits long, and is commonly overriden and could thus
return values from an even smaller range, so OID collisions were quite
likely.
This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the
object-specific part of the OID, and store these in an object => oid
java.util.WeakHashMap, making OID collisions almost impossible.
Patch by: me
Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at
googlemail dot com)
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java
b/ridljar/com/sun/star/uno/UnoRuntime.java
index ff2f297edb47..42c618ba9201 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -28,6 +28,8 @@ import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.UUID;
+import java.util.WeakHashMap;
import com.sun.star.lib.uno.typedesc.TypeDescription;
import com.sun.star.lib.util.WeakMap;
@@ -109,7 +111,16 @@ public class UnoRuntime {
if (object instanceof IQueryInterface) {
oid = ((IQueryInterface) object).getOid();
}
-return oid == null ? object.hashCode() + oidSuffix : oid;
+if (oid == null) {
+synchronized (oidMap) {
+ oid = oidMap.get(object);
+ if (oid == null) {
+ oid = UUID.randomUUID().toString() + oidSuffix;
+ oidMap.put(object, oid);
+ }
+}
+}
+return oid;
}
/**
@@ -677,6 +688,7 @@ public class UnoRuntime {
private final IBridge bridge;
}
+private static final WeakHashMap oidMap = new
WeakHashMap();
private static final String uniqueKeyHostPrefix
= Integer.toString(new Object().hashCode(), 16) + ":";
private static final Object uniqueKeyLock = new Object();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - apache-commons/java connectivity/java connectivity/prj connectivity/target.pmk dbaccess/source postprocess/packcomponents postprocess/packregistry
|7
scp2/source/ooo/module_hidden_ooo.scp
|2
71 files changed, 11235 insertions(+), 14 deletions(-)
New commits:
commit 330392f87e90e4345273d42425b3ffc735281a7c
Author: Damjan Jovanovic
Date: Sun Aug 20 19:16:28 2017 +
#i127350# - Table design: can't change length of Postgresql char types
Add the initial version of a new SDBC driver, for the PostgreSQL database.
Also its build changes: since it needs Apache Commons Lang version 3,
get configure.ac to check for that, and get that to always build,
just like our driver does.
Patch by: me
diff --git a/apache-commons/java/lang/makefile.mk
b/apache-commons/java/lang/makefile.mk
index 763f2bbe45e1..e9174bed4ff5 100644
--- a/apache-commons/java/lang/makefile.mk
+++ b/apache-commons/java/lang/makefile.mk
@@ -37,7 +37,7 @@ ANT_BUILDFILE=build.xml
TAR!:=$(GNUTAR)
-.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+.IF "$(SOLAR_JAVA)" != ""
# --- Files
TARFILE_NAME=commons-lang3-3.3-src
@@ -70,7 +70,7 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f
$(ANT_BUILDFILE) jar
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
+.IF "$(SOLAR_JAVA)" != ""
.INCLUDE : tg_ext.mk
.ENDIF
diff --git a/connectivity/java/sdbc_postgresql/build.xml
b/connectivity/java/sdbc_postgresql/build.xml
new file mode 100644
index ..42f8b5d33970
--- /dev/null
+++ b/connectivity/java/sdbc_postgresql/build.xml
@@ -0,0 +1,249 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://java.sun.com/j2se/1.4.2/docs/api";
+ packagelistLoc="${common.doc}/jdk1.4.2"/>
+http://java.sun.com/products/servlet/2.3/javadoc";
+ packagelistLoc="${common.doc}/servlet2.3"/>
+http://logging.apache.org/log4j/docs/api";
+ packagelistLoc="${common.doc}/log4j-1.2.8"/>
+http://java.sun.com/products/javabeans/glasgow/javadocs";
+ packagelistLoc="${common.doc}/jaf-1.0.2"/>
+http://java.sun.com/products/javamail/javadocs";
+ packagelistLoc="${common.doc}/javamail-1.3.1"/>
+http://ws.apache.org/soap/docs";
+ packagelistLoc="${common.doc}/soap-2.3.1"/>
+
+<i>Copyright © 2004 Sun Microsystems, Inc.,
901 San Antonio Road, Palo Alto, CA 94303 USA</i>
+${docname}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/connectivity/java/sdbc_postgresql/makefile.mk
b/connectivity/java/sdbc_postgresql/makefile.mk
new file mode 100644
index ..bab2fc72a123
--- /dev/null
+++ b/connectivity/java/sdbc_postgresql/makefile.mk
@@ -0,0 +1,50 @@
+#**
+#
+# 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, Ve
[Libreoffice-commits] core.git: ridljar/com
ridljar/com/sun/star/uno/UnoRuntime.java | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 3f84390f585cf71331a77ab5ca632cacaf3ad7b9
Author: Damjan Jovanovic
Date: Sun Aug 20 06:22:29 2017 +
i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliably
In the Java UNO bridge, UnoRuntime.generateOid() generated the
object-specific part of the OID using java.lang.Object.hashCode(),
which is only 32 bits long, and is commonly overriden and could thus
return values from an even smaller range, so OID collisions were quite
likely.
This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the
object-specific part of the OID, and store these in an object => oid
java.util.WeakHashMap, making OID collisions almost impossible.
Patch by: me
Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at
googlemail dot com)
(cherry picked from commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118)
Change-Id: I8e851a7a69ac2defefa15e9a00118d8f9fc0da95
Reviewed-on: https://gerrit.libreoffice.org/41576
Reviewed-by: Stephan Bergmann
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java
b/ridljar/com/sun/star/uno/UnoRuntime.java
index 1cba9d8b0258..99da56aa9ea8 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -23,6 +23,8 @@ import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.UUID;
+import java.util.WeakHashMap;
import com.sun.star.lib.uno.typedesc.FieldDescription;
import com.sun.star.lib.uno.typedesc.TypeDescription;
@@ -106,7 +108,16 @@ public class UnoRuntime {
if (object instanceof IQueryInterface) {
oid = ((IQueryInterface) object).getOid();
}
-return oid == null ? object.hashCode() + oidSuffix : oid;
+if (oid == null) {
+synchronized (oidMap) {
+ oid = oidMap.get(object);
+ if (oid == null) {
+ oid = UUID.randomUUID().toString() + oidSuffix;
+ oidMap.put(object, oid);
+ }
+}
+}
+return oid;
}
/**
@@ -690,6 +701,7 @@ public class UnoRuntime {
private final IBridge bridge;
}
+private static final WeakHashMap oidMap = new
WeakHashMap();
private static final String uniqueKeyHostPrefix
= Integer.toString(new Object().hashCode(), 16) + ":";
private static final Object uniqueKeyLock = new Object();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/sdbc/SQLException.idl |2 -- 1 file changed, 2 deletions(-) New commits: commit afa71c58f13726a76f7b0d46b6e834403ac8f97b Author: Damjan Jovanovic Date: Wed Aug 16 16:26:08 2017 + Remove some incorrect API documentation for the com.sun.star.sdbc.SQLException ErrorCode field. Patch by: me (cherry picked from commit ecd7e16c6d6277530879ed11e752d000248c56c7) Change-Id: I45fb25f1447fd6d37a38e80879de663ab3dbba99 Reviewed-on: https://gerrit.libreoffice.org/41568 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/offapi/com/sun/star/sdbc/SQLException.idl b/offapi/com/sun/star/sdbc/SQLException.idl index f34f7964eb37..bd2658334467 100644 --- a/offapi/com/sun/star/sdbc/SQLException.idl +++ b/offapi/com/sun/star/sdbc/SQLException.idl @@ -50,8 +50,6 @@ published exception SQLException: com::sun::star::uno::Exception /** returns an integer error code that is specific to each vendor. Normally this will be the actual error code returned by the underlying database. -A chain to the next Exception. This can be used to provide additional -error information. */ longErrorCode; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/container/enumhelper.cxx | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 920b5ac7e809bce39ae9f81172f4d3cf664c08fd
Author: Damjan Jovanovic
Date: Mon Jul 10 17:13:49 2017 +
If called on an empty collection, don't let
OEnumerationByIndex.nextElement()
call XIndexAccess.getByIndex() with an invalid index, just like
OEnumerationByName.nextElement() doesn't.
Patch by: me
(cherry picked from commit efa52a41051df84e03fc38aaeae0f6312eb2df4c)
Change-Id: Id49e45c18ed00de499cfd93e0945cecaed788ae4
Reviewed-on: https://gerrit.libreoffice.org/41574
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/comphelper/source/container/enumhelper.cxx
b/comphelper/source/container/enumhelper.cxx
index c5e49a6555c8..b62838d3b39c 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.cxx
@@ -170,14 +170,13 @@ css::uno::Any SAL_CALL OEnumerationByIndex::nextElement(
)
::osl::ResettableMutexGuard aLock(m_aLock);
css::uno::Any aRes;
-if (m_xAccess.is())
-{
+if (m_xAccess.is() && m_nPos < m_xAccess->getCount())
aRes = m_xAccess->getByIndex(m_nPos++);
-if (m_nPos >= m_xAccess->getCount())
-{
-impl_stopDisposeListening();
-m_xAccess.clear();
-}
+
+if (m_xAccess.is() && m_nPos >= m_xAccess->getCount())
+{
+impl_stopDisposeListening();
+m_xAccess.clear();
}
if (!aRes.hasValue())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/office/OfficeFilePicker.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 25aa9f30489801b2ed51395d7dad20ec0a2b0473
Author: Damjan Jovanovic
Date: Wed Nov 25 18:49:36 2015 +
Resolves: #i96720# FilePicker: setDefaultName...
setDefaultDirectory "broken"
Display the proposed filename even when the URL
specified for the file picker directory is invalid.
As the Win32 file picker sadly allows both paths and URLs
for directories, users try paths on other more
restrictive platforms, and since the file picker there
shows neither the directory nor the file, they wrongly
conclude both are broken.
Patch by: me
(cherry picked from commit 42d181e761c9903bfe5dd71334cadacebd1d0dc8)
Change-Id: I3f99937b667d7fe5198f6445ccd4d0e22d48c7c7
Reviewed-on: https://gerrit.libreoffice.org/28426
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/fpicker/source/office/OfficeFilePicker.cxx
b/fpicker/source/office/OfficeFilePicker.cxx
index cdf83c2..269e666 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -140,18 +140,28 @@ void SvtFilePicker::prepareExecute()
// --**-- doesn't match the spec yet
if ( !m_aDisplayDirectory.isEmpty() || !m_aDefaultName.isEmpty() )
{
+bool isFileSet = false;
if ( !m_aDisplayDirectory.isEmpty() )
{
-INetURLObject aPath( m_aDisplayDirectory );
+INetURLObject aPath;
+INetURLObject givenPath( m_aDisplayDirectory );
+if (!givenPath.HasError())
+aPath = givenPath;
+else
+{
+INetURLObject aStdDirObj( SvtPathOptions().GetWorkPath() );
+aPath = aStdDirObj;
+}
if ( !m_aDefaultName.isEmpty() )
{
aPath.insertName( m_aDefaultName );
getDialog()->SetHasFilename( true );
}
getDialog()->SetPath( aPath.GetMainURL( INetURLObject::NO_DECODE )
);
+isFileSet = true;
}
-else if ( !m_aDefaultName.isEmpty() )
+if ( !isFileSet && !m_aDefaultName.isEmpty() )
{
getDialog()->SetPath( m_aDefaultName );
getDialog()->SetHasFilename( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fileaccess/inc fileaccess/Library_fileacc.mk fileaccess/Makefile fileaccess/Module_fileaccess.mk fileaccess/prj fileaccess/source fileaccess/util p
Repository.mk |1 fileaccess/Library_fileacc.mk | 57 + fileaccess/Makefile| 32 ++ fileaccess/Module_fileaccess.mk| 30 + fileaccess/inc/fileaccess/dllapi.h | 36 fileaccess/prj/build.lst |3 - fileaccess/prj/d.lst |6 --- fileaccess/prj/makefile.mk | 44 + fileaccess/source/FileAccess.cxx |6 ++- fileaccess/source/fileacc.component| 30 - fileaccess/util/fileacc.component | 30 + postprocess/packcomponents/makefile.mk |2 - 12 files changed, 236 insertions(+), 41 deletions(-) New commits: commit 9b3e00b30c23151aa1cdfc97b7ec935cbcb4d7e2 Author: Damjan Jovanovic Date: Mon Aug 29 00:32:41 2016 + Port main/fileaccess to gbuild. Patch by: me diff --git a/Repository.mk b/Repository.mk index 0765379..fd3e491 100644 --- a/Repository.mk +++ b/Repository.mk @@ -61,6 +61,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ svgio \ editeng \ file \ +fileacc \ for \ forui \ fwe \ diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk new file mode 100644 index 000..4faadc9 --- /dev/null +++ b/fileaccess/Library_fileacc.mk @@ -0,0 +1,57 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + + + +$(eval $(call gb_Library_Library,fileacc)) + +$(eval $(call gb_Library_set_componentfile,fileacc,fileaccess/util/fileacc)) + +$(eval $(call gb_Library_set_include,fileacc,\ +$$(INCLUDE) \ +-I$(SRCDIR)/fileaccess/inc \ +)) + +$(eval $(call gb_Library_add_defs,fileacc,\ + -DFILEACCESS_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_api,fileacc,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,fileacc,\ + utl \ + tl \ + ucbhelper \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ +)) + + +$(eval $(call gb_Library_add_exception_objects,fileacc,\ + fileaccess/source/FileAccess \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/fileaccess/Makefile b/fileaccess/Makefile new file mode 100644 index 000..c1d144c --- /dev/null +++ b/fileaccess/Makefile @@ -0,0 +1,32 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/fileaccess/Module_fileaccess.mk b/fileaccess/Module_fileaccess.mk new file mode 100644 index 000..34d7cd4 --- /dev/null +++ b/fileaccess/Module_fileaccess.mk @@ -0,0 +1,30 @@ +#** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# d
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 8 commits - binaryurp/source connectivity/java connectivity/prj editeng/source offapi/com offapi/UnoApi_offapi.mk oowintool postprocess/packregistr
|2 connectivity/prj/build.lst |2 connectivity/prj/d.lst |2 editeng/source/accessibility/AccessibleStaticTextBase.cxx |2 offapi/UnoApi_offapi.mk |1 offapi/com/sun/star/sdb/ParameterSubstitution.idl | 71 oowintool |3 postprocess/packregistry/makefile.mk |2 sc/source/core/data/documen2.cxx |6 scp2/source/ooo/file_library_ooo.scp |7 scp2/source/ooo/file_ooo.scp |8 scp2/source/ooo/module_hidden_ooo.scp |2 scripting/java/org/openoffice/idesupport/ui/ConfigurePanel.java |2 sfx2/inc/sfx2/linkmgr.hxx | 10 sfx2/source/appl/linkmgr2.cxx | 66 solenv/gbuild/JunitTest.mk |4 solenv/inc/javaunittest.mk | 11 svtools/source/dialogs/addresstemplate.cxx |3 xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/FontDescription.java |2 58 files changed, 8206 insertions(+), 137 deletions(-) New commits: commit 0f76ba8b684aa6a71f61957a98003b0bd4c39a18 Author: Damjan Jovanovic Date: Fri Nov 10 01:31:17 2017 + Use Hamcrest in dmake subsequent tests too. Patch by: me diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk index 8e7a569b7cf4..f8c8a9e44bb1 100644 --- a/solenv/inc/javaunittest.mk +++ b/solenv/inc/javaunittest.mk @@ -50,6 +50,9 @@ JAVAFILES +:= $(JAVATESTFILES) EXTRAJARFILES += $(OOO_JUNIT_JAR) +.IF "$(HAMCREST_CORE_JAR)" != "" +EXTRAJARFILES += $(HAMCREST_CORE_JAR) +.END .INCLUDE: settings.mk @@ -73,11 +76,19 @@ ALLTAR : test .END .IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" +.IF "$(HAMCREST_CORE_JAR)" != "" +test .PHONY : $(JAVATARGET) +$(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ + '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(HAMCREST_CORE_JAR)$(PATH_SEPARATOR)$(CLASSPATH)' \ +org.junit.runner.JUnitCore \ +$(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//)) +.ELSE test .PHONY : $(JAVATARGET) $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \ '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \ org.junit.runner.JUnitCore \ $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//)) +.END .ELSE test .PHONY : echo 'test needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR' commit 090fa571e318b913601e01266d980f863ebc6f99 Author: Damjan Jovanovic Date: Fri Nov 10 01:18:59 2017 + Only specify Hamcrest in the classpath during subsequent tests if it's been specified. Patch by: me diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 3b85dd56e518..3be0c76381dd 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -46,7 +46,11 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest +ifeq ($(HAMCREST_CORE_JAR),) +$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib +else $(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(HAMCREST_CORE_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib +endif $(call gb_JunitTest_get_target,$(1)) : CLASSES := $(call gb_JunitTest_JunitTest_platform,$(1)) commit c21530c98020d7610d60f4ca11025d537dbd435f Author: Damjan Jovanovic
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source oowintool
connectivity/source/drivers/odbcbase/OStatement.cxx |2 +-
oowintool | 10 ++
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 0a382157b19c8b1a818e98c826613c99335a05ec
Author: Damjan Jovanovic
Date: Fri Nov 17 03:04:09 2017 +
64-bit ODBC's SQLGetStmtAttr() returns 64 bit values in *ValuePtr
(https://docs.microsoft.com/en-us/sql/odbc/reference/odbc-64-bit-information).
Patch by: me
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx
b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 514499a5cc08..b1c0a3316d4a 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -445,7 +445,7 @@ Reference< XResultSet > OStatement_Base::getResultSet
(sal_Bool checkCount) thro
sal_Int32 OStatement_Base::getStmtOption (short fOption) const
{
-sal_Int32 result = 0;
+SQLLEN result = 0;
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
N3SQLGetStmtAttr(m_aStatementHandle, fOption,&result,SQL_IS_INTEGER,NULL);
return result;
commit a48c71085e3c2df62295b49250d0b116cfb4b3c4
Author: Damjan Jovanovic
Date: Fri Nov 17 02:05:43 2017 +
Allow oowintool to find 32 bit VC++ in Cygwin64.
Patch by: Damjan Jovanovic and Matthias Seidel
Tested by: Matthias Seidel
diff --git a/oowintool b/oowintool
index 2b8f271bbd8c..8ebdae5dcd67 100755
--- a/oowintool
+++ b/oowintool
@@ -217,6 +217,11 @@ sub find_msvs()
$ver->{'product_dir'} = $install;
return $ver;
}
+ $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/" .
$ver->{'key'});
+ if (defined $install && $install ne '') {
+ $ver->{'product_dir'} = $install;
+ return $ver;
+ }
}
die "Can't find MS Visual Studio / VC++";
}
@@ -232,6 +237,11 @@ sub find_msvc()
$ver->{'product_dir'} = $install;
return $ver;
}
+ $install = reg_get_value("HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/" .
$ver->{'key'});
+ if (defined $install && $install ne '') {
+ $ver->{'product_dir'} = $install;
+ return $ver;
+ }
}
die "Can't find MS Visual Studio / VC++";
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/source
connectivity/source/drivers/odbcbase/OResultSet.cxx | 16
connectivity/source/drivers/odbcbase/OStatement.cxx | 20 ++--
connectivity/source/inc/odbc/OResultSet.hxx |2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit e2c1be67b8bf8513e58b80aed1ad7e9a2fe3d5e6
Author: Damjan Jovanovic
Date: Fri Nov 17 04:05:27 2017 +
More ODBC64 fixes, for SQLGetStmtAttr() and SQLSetStmtAttr().
Patch by: me
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 5747a0904d7a..273e96271e34 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -118,7 +118,7 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle
,OStatement_Base* pStmt) :
catch(Exception&)
{ // we don't want our result destroy here
}
-SQLINTEGER nCurType = 0;
+SQLULEN nCurType = 0;
try
{
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,&nCurType,SQL_IS_UINTEGER,0);
@@ -1263,7 +1263,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows(
const Sequence< Any >&
//--
sal_Int32 OResultSet::getResultSetConcurrency() const
{
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
SQLRETURN nReturn =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CONCURRENCY,&nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nReturn );
if(SQL_CONCUR_READ_ONLY == nValue)
@@ -1276,7 +1276,7 @@ sal_Int32 OResultSet::getResultSetConcurrency() const
//--
sal_Int32 OResultSet::getResultSetType() const
{
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_SENSITIVITY,&nValue,SQL_IS_UINTEGER,0);
if(SQL_SENSITIVE == nValue)
nValue = ResultSetType::SCROLL_SENSITIVE;
@@ -1284,7 +1284,7 @@ sal_Int32 OResultSet::getResultSetType() const
nValue = ResultSetType::SCROLL_INSENSITIVE;
else
{
-SQLINTEGER nCurType = 0;
+SQLULEN nCurType = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,&nCurType,SQL_IS_UINTEGER,0);
if(SQL_CURSOR_KEYSET_DRIVEN == nCurType)
nValue = ResultSetType::SCROLL_SENSITIVE;
@@ -1305,7 +1305,7 @@ sal_Int32 OResultSet::getFetchDirection() const
//--
sal_Int32 OResultSet::getFetchSize() const
{
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE,&nValue,SQL_IS_UINTEGER,0);
return nValue;
}
@@ -1323,7 +1323,7 @@ sal_Bool OResultSet::isBookmarkable() const
if(!m_aConnectionHandle)
return sal_False;
-sal_uInt32 nValue = 0;
+SQLULEN nValue = 0;
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_CURSOR_TYPE,&nValue,SQL_IS_UINTEGER,0);
sal_Int32 nAttr = 0;
@@ -1674,10 +1674,10 @@ sal_Bool OResultSet::move(IResultSetHelper::Movement
_eCursorPosition, sal_Int32
//
-
sal_Int32 OResultSet::getDriverPos() const
{
-sal_Int32 nValue = 0;
+SQLULEN nValue = 0;
SQLRETURN nRet =
N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_NUMBER,&nValue,SQL_IS_UINTEGER,0);
OSL_UNUSED( nRet );
-OSL_TRACE( __FILE__": OResultSet::getDriverPos() = Ret = %d, RowNum = %d,
RowPos = %d",nRet,nValue , m_nRowPos);
+OSL_TRACE( __FILE__": OResultSet::getDriverPos() = Ret = %d, RowNum = %lu,
RowPos = %d",nRet,nValue , m_nRowPos);
return nValue ? nValue : m_nRowPos;
}
//
-
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx
b/connectivity/source/drivers/odbcbase/OStatement.cxx
index b1c0a3316d4a..8b47185b38b3 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -297,7 +297,7 @@ sal_Bool OStatement_Base::lockIfNecessary (const
::rtl::OUString& sql) throw( SQ
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
try
{
-SQLINTEGER nLock = SQL_CONCUR_LOCK;
+SQLUINTEGER nLock = SQL_CONCUR_LOCK;
THROW_SQL(N3SQLSetStmtAttr(m_aStatementHandle,
SQL_CONCURRENCY,(SQLPOINTER)nLock,SQL_IS_UINTEGER));
}
catch (SQLWarning& warn)
@@ -679,7 +679,7 @@ sal_Int32 OStatement_Base::getMaxRows() const
sal_Int32 OStatement_Base::getResultSetConcurrency() const
{
OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
-sal_uInt32 nValue;
+SQLULEN nValue;
SQLRETURN nRetCode =
N3SQLGetS
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 7 commits - cui/source RepositoryExternal.mk solenv/gbuild ucb/Library_ucpexpand1.mk ucb/source
RepositoryExternal.mk | 72 -- cui/source/dialogs/winpluginlib.cpp| 222 cui/source/dialogs/winpluginlib.cxx| 223 + solenv/gbuild/platform/windows.mk |1 solenv/gbuild/platform/winmingw.mk |1 ucb/Library_ucpexpand1.mk |2 ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx |3 7 files changed, 274 insertions(+), 250 deletions(-) New commits: commit b70d73f84c1a02336b1cdac4bcb7c5f7a66dd712 Author: Damjan Jovanovic Date: Sat Jan 7 07:55:32 2017 + The internal CoinMP comes as a single library on Windows. Patch by: me diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ffa3dfc..40bcd9a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -515,8 +515,9 @@ endef else # !SYSTEM_COINMP -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ -CoinMP \ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,CoinMP)) +ifneq ($(OS),WNT) +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ CoinUtils \ Clp \ Cbc \ @@ -525,14 +526,16 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ Cgl \ CbcSolver \ )) +endif define gb_LinkTarget__use_coinmp $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(OUTDIR)/inc/coinmp \ ) +$(call gb_LinkTarget_add_linked_libs,$(1),CoinMP) +ifneq ($(OS),WNT) $(call gb_LinkTarget_add_linked_libs,$(1),\ -CoinMP \ CoinUtils \ Clp \ Cbc \ @@ -541,6 +544,7 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\ Cgl \ CbcSolver \ ) +endif endef endif # SYSTEM_COINMP commit 9dccbe10903c7981eac587efe00dacfa423c7aae Author: Damjan Jovanovic Date: Sat Jan 7 02:32:49 2017 + Fix inclusion of a precompiled header. Patch by: me diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx index 4666929..a0c14c8 100644 --- a/cui/source/dialogs/winpluginlib.cxx +++ b/cui/source/dialogs/winpluginlib.cxx @@ -19,7 +19,8 @@ * */ - +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_cui.hxx" #if defined _MSC_VER #pragma warning(push, 1) commit 520cc54956a4e8a9b8c8e7f590c6ac5e6d1fbc2c Author: Damjan Jovanovic Date: Sat Jan 7 02:31:21 2017 + Gbuild requires .cxx filename extensions. Patch by: me diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cxx similarity index 100% rename from cui/source/dialogs/winpluginlib.cpp rename to cui/source/dialogs/winpluginlib.cxx commit 3e50f819011be5e8881dc8f90ad7b34bd8860418 Author: Damjan Jovanovic Date: Sat Jan 7 02:16:40 2017 + Fix repository and name for apr, apr-util, serf and curl on Windows. Patch by: me diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a4a0b6a..ffa3dfc 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -377,18 +377,22 @@ endef else # !SYSTEM_APR -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ -apr-1 \ -)) +ifeq ($(OS),WNT) +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,libapr-1)) +else +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,apr-1)) +endif define gb_LinkTarget__use_apr $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(OUTDIR)/inc/apr \ ) -$(call gb_LinkTarget_add_linked_libs,$(1),\ -apr-1 \ -) +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_linked_libs,$(1),libapr-1) +else +$(call gb_LinkTarget_add_linked_libs,$(1),apr-1) +endif endef endif # SYSTEM_APR @@ -409,18 +413,21 @@ endef else # !SYSTEM_APR_UTIL -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ -aprutil-1 \ -)) +# on Windows apr-util is registered by ext_libraries/Repository.mk +ifneq ($(OS),WNT) +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,aprutil-1)) +endif define gb_LinkTarget__use_apr_util $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(OUTDIR)/inc/apr-util \ ) -$(call gb_LinkTarget_add_linked_libs,$(1),\ -aprutil-1 \ -) +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_linked_libs,$(1),apr-util) +else +$(call gb_LinkTarget_add_linked_libs,$(1),aprutil-1) +endif endef endif # SYSTEM_APR_UTIL @@ -441,18 +448,21 @@ endef else # !SYSTEM_SERF -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ -serf-1 \ -)) +# on Windows serf is registered by ext_libraries/Repository.mk +ifneq ($(OS),WNT) +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,serf-1)) +endif define gb_LinkTarget__use_serf $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(OUTDIR)/inc/serf \ ) -$(call gb_LinkTarget_add_linked_libs,$(1),\ -serf-1 \ -) +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_linked_libs,$(1),serf) +el
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/Library_cui.mk RepositoryFixes.mk
RepositoryFixes.mk | 26 +- cui/Library_cui.mk |5 - 2 files changed, 25 insertions(+), 6 deletions(-) New commits: commit 21f210aaf26636e2c258cdd52478d1a6d925f921 Author: Damjan Jovanovic Date: Sun Jan 8 19:57:08 2017 + Fix a Windows naming clash between main/cui, whose library, icuin.lib, was clashing with main/icu's icuin.lib once we started using gbuild, which places libraries in a common directory. The main/cui library is now just icui.lib, and main/icu's is still icuin.lib. Also update RepositoryFixes.mk with all the main/icu libraries. Patch by: me diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 17873dd..a59ab76 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -70,7 +70,6 @@ ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES)) @@ -93,7 +92,10 @@ gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES # all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library # we link against their dlls in gcc format directly gb_Library_NOILIBFILENAMES:=\ +icudt \ +icuin \ icule \ +icutu \ icuuc \ uwinapi \ winmm \ @@ -112,7 +114,10 @@ gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT)) gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess$(gb_Library_MAJORVER)%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) @@ -123,7 +128,6 @@ gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS)) else #ifneq ($(USE_MINGW),) gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES)) @@ -143,7 +147,12 @@ gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE) -gb_Library_NOILIBFILENAMES += icuuc icule +gb_Library_NOILIBFILENAMES += \ +icudt \ +icuin \ +icule \ +icutu \ +icuuc gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES)) gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) @@ -154,6 +163,10 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES)) #endif gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES)) +gb_Library_DLLFILENAMES := $(patsubst icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) @@ -200,8 +213,11 @@ gb_Library_DLLFILENAMES := $(patsubst sfx:test_sfx2_metadatable%,sfx:tstsfx2m%,$ gb_Library_NOILIBFILENAMES:=\ ft2lib
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/Library_cui.mk external_deps.lst python/makefile.mk python/prj python/python-2.7.12-mingw.patch python/python-2.7.12-nohardlink.pat
cui/Library_cui.mk|2 external_deps.lst |6 python/makefile.mk|2 python/prj/d.lst | 108 +- python/python-2.7.12-mingw.patch | 571 --- python/python-2.7.12-nohardlink.patch | 11 python/python-2.7.12-pcbuild.patch| 1710 -- python/python-2.7.12-sysbase.patch| 14 python/python-2.7.13-mingw.patch | 571 +++ python/python-2.7.13-nohardlink.patch | 11 python/python-2.7.13-pcbuild.patch| 1710 ++ python/python-2.7.13-sysbase.patch| 14 python/python-freebsd.patch | 46 python/python-md5.patch |6 python/python-solaris.patch |4 python/python-solver-before-std.patch |6 python/python-ssl.patch | 12 python/pyversion.mk |2 18 files changed, 2403 insertions(+), 2403 deletions(-) New commits: commit 27f0c3366b4fb7c667d400e953c033f07de675f3 Author: Damjan Jovanovic Date: Mon Jan 9 01:47:34 2017 + Fix a missing bracket problem in a main/cui makefile when BUILD_VER_STRING is set. Patch by: me diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 8d448ad..c4e56c4 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,cui,\ )) ifneq ($(BUILD_VER_STRING),) -$(eval $(call gb_Library_add_defs,cui,-DBUILD_VER_STRING="$(BUILD_VER_STRING")) +$(eval $(call gb_Library_add_defs,cui,-DBUILD_VER_STRING="$(BUILD_VER_STRING)")) endif $(eval $(call gb_Library_add_defs,cui,\ commit d6e0c30370effa6326fd174f6f05227a1c86c8d6 Author: Pedro Giffuni Date: Mon Jan 9 00:45:26 2017 + Bring new Python bugfix release version 2.7.13. Release Notes: https://hg.python.org/cpython/raw-file/v2.7.13/Misc/NEWS Tested on FreeBSD but since it is a minor update, we don't expect problems on other platforms. diff --git a/external_deps.lst b/external_deps.lst index 0eb7931b..5a02e6a 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -201,9 +201,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) -MD5 = 88d61f82e3616a4be952828b3694109d -name = Python-2.7.12.tgz -URL1 = http://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz +MD5 = 17add4bf0ad0ec2f08e0cae6d205c700 +name = Python-2.7.13.tgz +URL1 = http://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 5580971..22ab60e 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=88d61f82e3616a4be952828b3694109d +TARFILE_MD5=17add4bf0ad0ec2f08e0cae6d205c700 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index 157aca8..b521c1e 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.12\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.12\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sc/inc sc/Library_scfilt.mk sc/Library_scui.mk sc/Library_vbaobj.mk sc/source
sc/Library_scfilt.mk |4 sc/Library_scui.mk |4 sc/Library_vbaobj.mk |5 + sc/inc/pch/precompiled_scfilt.hxx|3 +++ sc/source/filter/excel/xiescher.cxx |2 +- sc/source/ui/attrdlg/attrdlg.cxx |2 -- sc/source/ui/attrdlg/scdlgfact.cxx |1 - sc/source/ui/attrdlg/scuiexp.cxx |1 - sc/source/ui/attrdlg/tabpages.cxx|1 - sc/source/ui/cctrl/editfield.cxx |3 --- sc/source/ui/dbgui/dapidata.cxx |1 - sc/source/ui/dbgui/dapitype.cxx |1 - sc/source/ui/dbgui/dpgroupdlg.cxx|3 --- sc/source/ui/dbgui/pfiltdlg.cxx |1 - sc/source/ui/dbgui/pvfundlg.cxx |1 - sc/source/ui/dbgui/scendlg.cxx |1 - sc/source/ui/dbgui/scuiasciiopt.cxx |1 - sc/source/ui/dbgui/scuiimoptdlg.cxx |1 - sc/source/ui/dbgui/sortdlg.cxx |1 - sc/source/ui/dbgui/subtdlg.cxx |1 - sc/source/ui/dbgui/textimportoptions.cxx |1 - sc/source/ui/dbgui/tpsort.cxx|1 - sc/source/ui/dbgui/tpsubt.cxx|1 - sc/source/ui/dbgui/validate.cxx |3 --- sc/source/ui/docshell/tpstat.cxx |1 - sc/source/ui/miscdlgs/crdlg.cxx |3 +-- sc/source/ui/miscdlgs/delcldlg.cxx |1 - sc/source/ui/miscdlgs/delcodlg.cxx |1 - sc/source/ui/miscdlgs/filldlg.cxx|1 - sc/source/ui/miscdlgs/groupdlg.cxx |1 - sc/source/ui/miscdlgs/inscldlg.cxx |1 - sc/source/ui/miscdlgs/inscodlg.cxx |1 - sc/source/ui/miscdlgs/instbdlg.cxx |1 - sc/source/ui/miscdlgs/lbseldlg.cxx |1 - sc/source/ui/miscdlgs/linkarea.cxx |1 - sc/source/ui/miscdlgs/mtrindlg.cxx |1 - sc/source/ui/miscdlgs/mvtabdlg.cxx |1 - sc/source/ui/miscdlgs/namecrea.cxx |1 - sc/source/ui/miscdlgs/namepast.cxx |1 - sc/source/ui/miscdlgs/scuiautofmt.cxx|1 - sc/source/ui/miscdlgs/shtabdlg.cxx |1 - sc/source/ui/miscdlgs/strindlg.cxx |1 - sc/source/ui/miscdlgs/tabbgcolordlg.cxx |1 - sc/source/ui/miscdlgs/textdlgs.cxx |1 - sc/source/ui/optdlg/opredlin.cxx |1 - sc/source/ui/optdlg/tpcalc.cxx |1 - sc/source/ui/optdlg/tpprint.cxx |1 - sc/source/ui/optdlg/tpusrlst.cxx |1 - sc/source/ui/optdlg/tpview.cxx |1 - sc/source/ui/pagedlg/hfedtdlg.cxx|1 - sc/source/ui/pagedlg/scuitphfedit.cxx|1 - sc/source/ui/pagedlg/tphf.cxx|1 - sc/source/ui/pagedlg/tptable.cxx |1 - sc/source/ui/styleui/styledlg.cxx|1 - 54 files changed, 6 insertions(+), 70 deletions(-) New commits: commit b1870b5253d796fc2adaec0a863356e014d70423 Author: Damjan Jovanovic Date: Mon Jan 16 05:04:34 2017 + Build fixes for vbaobj on Windows. Don't use SC_DLLIMPLEMENTATION, and link to sot. With this, main/sc finally builds on Windows. Patch by: me diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 0049ab9..287ff8d 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_include,vbaobj,\ -I$(SRCDIR)/sc/source/filter/inc \ )) -$(eval $(call gb_Library_add_defs,vbaobj,\ - -DSC_DLLIMPLEMENTATION \ -)) - $(eval $(call gb_Library_add_api,vbaobj,\ offapi \ oovbaapi \ @@ -56,6 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,vbaobj,\ sb \ sc \ sfx \ + sot \ stl \ svl \ svt \ commit d3ecadc0670334f1b09f7d9f03e896ff365a3255 Author: Damjan Jovanovic Date: Mon Jan 16 03:02:57 2017 + Fix symbol visibility problems with main/sc modules. SC_DLLIMPLEMENTATION must only be defined for sc itself, not for scui or scfilt, as that stops them from importing sc's symbols. Should fix building main/sc on Windows. Patch by: me diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index de82e71..b2a0804 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_include,scfilt,\ -I$(SRCDIR)/sc/source/filter/inc \ )) -$(eval $(call gb_Library_add_defs,scfilt,\ - -DSC_DLLIMPLEMENTATION \ -)) - $(eval $(call gb_Library_add_api,scfilt,\ offapi \ udkapi \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index 4a18c82..c0ea6d2 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_include,scui,\ -I$(SRCDIR)/sc/source/filter/inc \ )) -$(eval $(call gb_Library_add_defs,scui,\ - -DSC_DLLIMPLEMENTATION \ -)) - $(eval $(call gb_Library_add_api,scui,\ offapi \ udkapi \ diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - automation/Library_communi.mk.old avmedia/Library_avmediagst.mk cosv/prj
automation/Library_communi.mk.old | 99 -- avmedia/Library_avmediagst.mk |7 +- cosv/prj/build.lst|1 3 files changed, 5 insertions(+), 102 deletions(-) New commits: commit d42fe4f30e3ea154600c8e5b5892051922325707 Author: Damjan Jovanovic Date: Tue Jan 17 18:10:51 2017 + Some gbuild fixes discovered during an audit compared to dmake. Delete an unnecessary file in main/automation. Disable exception handling for 2 files in main/avmedia. Patch by: me diff --git a/automation/Library_communi.mk.old b/automation/Library_communi.mk.old deleted file mode 100644 index a890e45..000 --- a/automation/Library_communi.mk.old +++ /dev/null @@ -1,99 +0,0 @@ -#** -# -# 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 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#** - - - -$(eval $(call gb_Library_Library,communi)) - -$(eval $(call gb_Library_add_precompiled_header,communi,$(SRCDIR)/automation/inc/pch/precompiled_automation)) - -$(eval $(call gb_Library_add_package_headers,communi,automation_inc)) - -$(eval $(call gb_Library_set_include,communi,\ -$$(INCLUDE) \ - -I$(SRCDIR)/automation/inc \ - -I$(SRCDIR)/automation/inc/pch \ - -I$(SRCDIR)/automation/source/inc \ -)) - -#$(eval $(call gb_Library_add_defs,communi,\ -# -DAVMEDIA_DLLIMPLEMENTATION \ -#)) - -$(eval $(call gb_Library_add_api,communi,\ - offapi \ - udkapi \ -)) - -$(eval $(call gb_Library_add_linked_libs,communi,\ - sal \ - simplecm \ - svl \ - tl \ - vcl \ - vos3 \ - $(gb_STDLIBS) \ -)) - -ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,communi,\ - advapi32 \ - gdi32 \ -)) -endif - -$(eval $(call gb_Library_add_noexception_objects,communi,\ - automation/source/communi/communi \ - automation/source/server/recorder \ - automation/source/server/svcommstream \ - automation/source/server/cmdbasestream \ - automation/source/server/scmdstrm \ - automation/source/server/sta_list \ - automation/source/server/editwin \ - automation/source/server/retstrm \ - automation/source/server/profiler \ - automation/source/simplecm/tcpio \ - automation/source/simplecm/packethandler \ - automation/source/simplecm/simplecm \ -)) - -ifeq ($(OS),SOLARIS) -$(eval $(call gb_Library_add_noexception_objects,communi,\ - automation/source/server/prof_usl \ -)) -else -$(eval $(call gb_Library_add_noexception_objects,communi,\ - automation/source/server/prof_nul \ -)) -endif - -$(eval $(call gb_Library_add_exception_objects,communi,\ - automation/source/server/XMLParser \ - automation/source/server/server \ -)) - -$(eval $(call gb_Library_add_cxxobjects,dnd,\ - automation/source/server/statemnt \ - , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -)) - - -# vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 7ceecd1..b37ef6e 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -62,10 +62,13 @@ $(eval $(call gb_Library_add_libs,avmediagst,\ $(eval $(call gb_Library_add_exception_objects,avmediagst,\ avmedia/source/gstreamer/gstuno \ - avmedia/source/gstreamer/gstmanager \ - avmedia/source/gstreamer/gstwindow \ avmedia/source/gstreamer/gstplayer \ avmedia/source/gstreamer/gstframegrabber \ )) +$(eval $(call gb_Library_add_noexception_objects,avmediagst,\ + avmedia/source/gstreamer/gstmanager \ + avmedia/source/gstreamer/gstwindow \ +)) + # vim: set noet sw=4 ts=4: commit dacecb6cec89ec425db349f5739b6096174f2192 Author: Damjan Jovanovic Date: Tue Jan 17 18:09:12 2017 + Make main/cosv's prj/build.lst more suitable for automated analysis. Patch by: me diff --git a/cosv/prj/build.lst b/cosv/prj/build.lst index f75303c..0c036f9 100644 --- a/cosv/prj/build.lst +++ b/cosv/p
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - postprocess/prj sc/JunitTest_sc_complex.mk test/inc test/prj test/source
postprocess/prj/build.lst |2 sc/JunitTest_sc_complex.mk |2 test/inc/makefile.mk| 36 + test/inc/pch/precompiled_test.cxx | 24 test/inc/pch/precompiled_test.hxx | 28 test/inc/test/detail/testdllapi.hxx | 37 + test/inc/test/gettestargument.hxx | 42 + test/inc/test/officeconnection.hxx | 63 + test/inc/test/oustringostreaminserter.hxx | 46 + test/inc/test/toabsolutefileurl.hxx | 42 + test/inc/test/uniquepipename.hxx| 40 + test/prj/build.lst |6 test/prj/d.lst | 17 test/source/cpp/getargument.cxx | 45 + test/source/cpp/getargument.hxx | 42 + test/source/cpp/gettestargument.cxx | 39 + test/source/cpp/makefile.mk | 72 ++ test/source/cpp/officeconnection.cxx| 170 + test/source/cpp/toabsolutefileurl.cxx | 81 ++ test/source/cpp/uniquepipename.cxx | 44 + test/source/cpp/unoexceptionprotector/makefile.mk | 67 ++ test/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx | 96 ++ test/source/java/org/openoffice/test/Argument.java | 32 test/source/java/org/openoffice/test/FileHelper.java| 56 + test/source/java/org/openoffice/test/OfficeConnection.java | 220 ++ test/source/java/org/openoffice/test/OfficeFileUrl.java | 38 + test/source/java/org/openoffice/test/TestArgument.java | 35 + test/source/java/org/openoffice/test/makefile.mk| 53 + test/source/java/org/openoffice/test/tools/DocumentType.java| 60 + test/source/java/org/openoffice/test/tools/OfficeDocument.java | 324 ++ test/source/java/org/openoffice/test/tools/OfficeDocumentView.java | 140 test/source/java/org/openoffice/test/tools/SpreadsheetDocument.java | 69 ++ test/source/java/org/openoffice/test/tools/SpreadsheetView.java | 68 ++ test/source/java/org/openoffice/test/tools/makefile.mk | 47 + 34 files changed, 2181 insertions(+), 2 deletions(-) New commits: commit b4448f13ef5a8ddece9dd35f4ca749aa203cb976 Author: Damjan Jovanovic Date: Wed Jan 18 05:16:11 2017 + Fix a main/sc JunitTest typo. Patch by: me diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk index f946a3a..03d34c6 100644 --- a/sc/JunitTest_sc_complex.mk +++ b/sc/JunitTest_sc_complex.mk @@ -32,7 +32,7 @@ $(eval $(call gb_JunitTest_add_jars,sc_complex,\ )) $(eval $(call gb_JunitTest_add_sourcefiles,sc_complex,\ - sc/qa/complex/sc/CalcCRTL \ + sc/qa/complex/sc/CalcRTL \ )) $(eval $(call gb_JunitTest_add_classes,sc_complex,\ commit 74dc26ee5acba162d704a5ff4082391fb2953f1e Author: Damjan Jovanovic Date: Wed Jan 18 04:32:59 2017 + Resurrect main/test, which was deleted by liuzhe in r1378870, probably by accident, and which we need for test.jar and test-tools.jar for subsequent tests. I am only bringing back the prj, inc and source subdirectories, as the others are unnecessary. Patch by: me diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 62aa24e..9993021 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign sdext SWEXT:swext smoketestdoc uui writerfilter winaccessibility oox MYSQLC:mysqlc LIBXSLT:libxslt NULL +po postprocess :: svgio accessibility automation basctl bean chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 io JAVAINSTALLER2
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - set_soenv.in sw/qa
set_soenv.in |2 +-
sw/qa/complex/checkColor/CheckChangeColor.java |3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 5cf449daa11726dc29f20f23f1e74b2564dc0551
Author: Damjan Jovanovic
Date: Wed Jan 18 20:59:35 2017 +
Fix a main/sw subsequent test. The BackColor of a page style is irrelevant
since we only want to test changing it, and it only seems to have meaning
when the FillStyle is color, which it isn't.
Patch by: me
diff --git a/sw/qa/complex/checkColor/CheckChangeColor.java
b/sw/qa/complex/checkColor/CheckChangeColor.java
index 949e420..07b59bd 100644
--- a/sw/qa/complex/checkColor/CheckChangeColor.java
+++ b/sw/qa/complex/checkColor/CheckChangeColor.java
@@ -63,9 +63,6 @@ public class CheckChangeColor {
XPropertySet xPropertySet = (XPropertySet)
UnoRuntime.queryInterface(XPropertySet.class,
xPageStyleCollection.getByName("Standard") );
assertEquals(
-"BackColor", new Any(Type.LONG, 0x),
-Any.complete(xPropertySet.getPropertyValue("BackColor")));
-assertEquals(
"IsLandscape", new Any(Type.BOOLEAN, false),
Any.complete(xPropertySet.getPropertyValue("IsLandscape")));
assertEquals(
commit 70af00b96ab2d5914dbe06e74630fc1ffabdd4ae
Author: Damjan Jovanovic
Date: Wed Jan 18 20:58:11 2017 +
Add a ./configure option for Hamcrest once again, this time optional,
so that newer versions of JUnit can work.
Patch by: me
diff --git a/set_soenv.in b/set_soenv.in
index 7db8d39..c79671b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1641,7 +1641,7 @@ ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@","e" );
-# ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" );
+ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" );
ToFile( "SAC_JAR", "@SAC_JAR@", "e" );
ToFile( "LIBXML_JAR","@LIBXML_JAR@", "e" );
ToFile( "FLUTE_JAR", "@FLUTE_JAR@","e" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/gbuild
solenv/gbuild/JavaClassSet.mk |3 ++-
solenv/gbuild/platform/freebsd.mk |2 +-
solenv/gbuild/platform/linux.mk|2 +-
solenv/gbuild/platform/macosx.mk |2 +-
solenv/gbuild/platform/os2.mk | 36 +---
solenv/gbuild/platform/solaris.mk |2 +-
solenv/gbuild/platform/windows.mk | 36 +---
solenv/gbuild/platform/winmingw.mk | 11 +++
8 files changed, 19 insertions(+), 75 deletions(-)
New commits:
commit fdceace757ab51da03547798676e44b2b34daf29
Author: Damjan Jovanovic
Date: Sun Jan 22 17:09:50 2017 +
Don't use the "archive" package format, which is to be extrated by
smoketest as a side effect, for the subsequent tests. The smoketest
is currently broken and won't do that, and the path is wrong anyway,
as it was for OpenOffice 3 and we're now on 4.
Instead, use the office instance from the "installed" package format
for subsequent tests, as it doesn't have to zipped up and unzipped,
resulting in faster building and faster testing, and doesn't require
a side effect in a module that will probably be moved from main/
to test/.
Patch by: me
diff --git a/solenv/gbuild/platform/freebsd.mk
b/solenv/gbuild/platform/freebsd.mk
index 5d4dd05..d576df1 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -402,7 +402,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}"
\
+
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
\
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index e50c986..1981101 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -381,7 +381,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice}"
\
+
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
\
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 7bcbec7..5ebf76e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -418,7 +418,7 @@ endef
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
-
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/OpenOffice.org.app/Contents/MacOS/soffice}"
\
+
-Dorg.openoffice.test.arg.soffice="{OOO_TEST_SOFFICE:-path:$(SRCDIR)/instsetoo_native/$(INPATH)/Apache_OpenOffice/installed/install/en-US/openoffice4/program/soffice}"
\
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call
gb_JunitTest_get_userdir,$(1)) \
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index 9cec835..f68679f 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -514,43 +514,9 @@ endef
# JunitTest class
-gb_defaultlangiso := en-US
-gb_smoketest_instset :=
$(SRCDIR)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(gb_defaultlangiso)/OOo_*_install-arc_$(gb_defaultlangiso).zip
-
-ifeq ($(OOO_TEST_SOFFICE),)
-
-
-# Work around Windows problems with long pathnames (see issue 50885) by
-# installing into the temp directory instead of the module output tree (in
which
-# case $(target).instpath contains the path to the temp installation,
-# which is removed after smoketest); can be removed once issue 50885 is fixed;
-# on other platforms, a single installation to solver is created in
-# smoketestoo_native.
-
-# for now, no dependency on $(shell ls $(gb_smoketest_instset))
-# because that doesn't work before the instset is built
-# and there is not much of a benefit anyway (gbuild not knowing about
smoketest)
-define gb_JunitTest_JunitTest_platform_longpathname_hack
-$(call gb_JunitTest_get_target,$(1)) : $(call
gb_JunitTest_get_target,$(1)).instpath
-$(call gb_JunitTest_get_target,$(1)) : CLEAN_CMD = $(call
gb_Helper_abbreviate_dirs,rm -rf `cat $$@.instpath` $$@.instpath)
-
-$(call gb_JunitTest_get_t
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/source
connectivity/source/inc/odbc/OFunctions.hxx | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) New commits: commit 72c9a57b915e080b4bd27800f30232624172b1c3 Author: Damjan Jovanovic Date: Sun Nov 19 14:37:19 2017 + Fix an argument for SQLSetDescRec. Remove a duplicated and commented T3SQLNativeSql definition. Patch by: me diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx index ac689c620b54..bddcc8d34698 100644 --- a/connectivity/source/inc/odbc/OFunctions.hxx +++ b/connectivity/source/inc/odbc/OFunctions.hxx @@ -192,7 +192,7 @@ namespace connectivity SQLSMALLINT RecNumber, SQLSMALLINT Type, SQLSMALLINT SubType, -SQLINTEGER Length, +SQLLEN Length, SQLSMALLINT Precision, SQLSMALLINT Scale, SQLPOINTER DataPtr, @@ -247,15 +247,6 @@ namespace connectivity #define N3SQLExecDirect(a,b,c) (*(T3SQLExecDirect)getOdbcFunction(ODBC3SQLExecDirect))(a,b,c) -/*typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHDBC ConnectionHandle, -SQLCHAR * InStatementText, -SQLINTEGER TextLength1, -SQLCHAR * utStatementText, -SQLINTEGER BufferLength, -SQLINTEGER * TextLength2Ptr); - -#define N3SQLNativeSql(a,b,c,d,e,f) (*(T3SQLNativeSql)getOdbcFunction(ODBC3SQLNativeSql))(a,b,c,d,e,f)*/ - typedef SQLRETURN (SQL_API *T3SQLDescribeParam) (SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNumber, SQLSMALLINT * DataTypePtr, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/inc/odbc/OFunctions.hxx | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) New commits: commit dbb42ebced375a366712394c1e8917e78abd7a5e Author: Damjan Jovanovic Date: Sun Nov 19 14:37:19 2017 + Fix an argument for SQLSetDescRec. Remove a duplicated and commented T3SQLNativeSql definition. Patch by: me (cherry picked from commit 72c9a57b915e080b4bd27800f30232624172b1c3) Change-Id: I2730ede794f750181075b253f62951d47ec82ddc Reviewed-on: https://gerrit.libreoffice.org/45176 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx index 2ad9043541b1..95787a1db4d2 100644 --- a/connectivity/source/inc/odbc/OFunctions.hxx +++ b/connectivity/source/inc/odbc/OFunctions.hxx @@ -188,7 +188,7 @@ bool LoadLibrary_ODBC3(OUString &_rPath); SQLSMALLINT RecNumber, SQLSMALLINT Type, SQLSMALLINT SubType, -SQLINTEGER Length, +SQLLEN Length, SQLSMALLINT Precision, SQLSMALLINT Scale, SQLPOINTER DataPtr, @@ -243,15 +243,6 @@ bool LoadLibrary_ODBC3(OUString &_rPath); #define N3SQLExecDirect(a,b,c) (*reinterpret_cast(getOdbcFunction(ODBC3SQLFunctionId::ExecDirect)))(a,b,c) -/*typedef SQLRETURN (SQL_API *T3SQLNativeSql) ( SQLHDBC ConnectionHandle, -SQLCHAR * InStatementText, -SQLINTEGER TextLength1, -SQLCHAR * utStatementText, -SQLINTEGER BufferLength, -SQLINTEGER * TextLength2Ptr); - -#define N3SQLNativeSql(a,b,c,d,e,f) (*reinterpret_cast(getOdbcFunction(ODBC3SQLFunctionId::NativeSql)))(a,b,c,d,e,f)*/ - typedef SQLRETURN (SQL_API *T3SQLDescribeParam) (SQLHSTMT StatementHandle, SQLUSMALLINT ParameterNumber, SQLSMALLINT * DataTypePtr, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/gdi/pngread.cxx | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 9819064de0ac29755bbf244fb3115d5b539df85f
Author: Damjan Jovanovic
Date: Sat Nov 25 13:21:24 2017 +
Add range checking to PNG palette indexes,
as per OSS-Fuzz issue 574.
Patch by: me
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index b35db105cfca..e2ec7daa1bb5 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
// ---
// - Defines -
@@ -296,7 +297,7 @@ bool PNGReaderImpl::ReadNextChunk()
if( mnChunkLen < 0 )
return false;
const sal_Size nStreamPos = mrPNGStream.Tell();
-if( nStreamPos + mnChunkLen >= mnStreamSize )
+if( nStreamPos + mnChunkLen + 4 >= mnStreamSize )
return false;
// calculate chunktype CRC (swap it back to original byte order)
@@ -434,7 +435,16 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size&
rPreviewSizeHint )
if ( !mpInflateInBuf ) // taking care that the header has
properly been read
mbStatus = sal_False;
else if ( !mbIDAT ) // the gfx is finished, but there may
be left a zlibCRC of about 4Bytes
-ImplReadIDAT();
+{
+try
+{
+ImplReadIDAT();
+}
+catch (::com::sun::star::lang::IndexOutOfBoundsException&)
+{
+mbStatus = sal_False;
+}
+}
}
break;
@@ -1644,6 +1654,8 @@ void PNGReaderImpl::ImplSetPixel( sal_uInt32 nY,
sal_uInt32 nX, sal_uInt8 nPalIn
return;
nX >>= mnPreviewShift;
+if (nPalIndex >= mpAcc->GetPaletteEntryCount())
+throw ::com::sun::star::lang::IndexOutOfBoundsException();
mpAcc->SetPixelIndex( nY, nX, nPalIndex );
}
@@ -1674,6 +1686,8 @@ void PNGReaderImpl::ImplSetAlphaPixel( sal_uInt32 nY,
sal_uInt32 nX,
return;
nX >>= mnPreviewShift;
+if (nPalIndex >= mpAcc->GetPaletteEntryCount())
+throw ::com::sun::star::lang::IndexOutOfBoundsException();
mpAcc->SetPixelIndex( nY, nX, nPalIndex );
mpMaskAcc->SetPixelIndex( nY, nX, ~nAlpha );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - unixODBC/Makefile unixODBC/Module_unixODBC.mk unixODBC/Package_inc.mk unixODBC/prj
unixODBC/Makefile | 32 unixODBC/Module_unixODBC.mk | 30 ++ unixODBC/Package_inc.mk | 30 ++ unixODBC/prj/build.lst |6 +++--- unixODBC/prj/d.lst |3 --- unixODBC/prj/makefile.mk| 44 6 files changed, 139 insertions(+), 6 deletions(-) New commits: commit 19c13a1a1cc3f275cd2b11bb82afe0a3b75392d6 Author: Damjan Jovanovic Date: Mon Nov 27 05:09:40 2017 + Port main/unixOBDC to gbuild. Patch by: me diff --git a/unixODBC/Makefile b/unixODBC/Makefile new file mode 100644 index ..c1d144cbd4c9 --- /dev/null +++ b/unixODBC/Makefile @@ -0,0 +1,32 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/unixODBC/Module_unixODBC.mk b/unixODBC/Module_unixODBC.mk new file mode 100644 index ..64490d02d5ae --- /dev/null +++ b/unixODBC/Module_unixODBC.mk @@ -0,0 +1,30 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + + + +$(eval $(call gb_Module_Module,unixODBC)) + +$(eval $(call gb_Module_add_targets,unixODBC,\ + Package_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/unixODBC/Package_inc.mk b/unixODBC/Package_inc.mk new file mode 100644 index ..c7fdc99911c8 --- /dev/null +++ b/unixODBC/Package_inc.mk @@ -0,0 +1,30 @@ +#** +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#** + + + +$(eval $(call gb_Package_Package,unixODBC_inc,$(SRCDIR)/unixODBC)) + +$(eval $(call gb_Package_add_file,unixODBC_inc,inc/external/odbc/iodbcunix.h,inc/iodbcunix.h)) +$(eval $(call gb_Package_add_file,unixODBC_inc,inc/external/odbc/sql.h,inc/sql.h)) +$(eval $(call gb_Package_add_file,unixODBC_inc,inc/external/odbc/sqlext.h,inc/sqlext.h)) +$(eval $(call gb_Package_add_file,unixODBC_inc,inc/external/odbc/sqltypes.h,inc/sqltypes.h)) +$(eval $(call g
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild
solenv/gbuild/Library.mk |1 + solenv/gbuild/LinkTarget.mk |9 + solenv/gbuild/platform/freebsd.mk |2 ++ solenv/gbuild/platform/linux.mk |2 ++ solenv/gbuild/platform/macosx.mk |2 ++ solenv/gbuild/platform/os2.mk |2 ++ solenv/gbuild/platform/solaris.mk |2 ++ 7 files changed, 20 insertions(+) New commits: commit 0c9f2c424899159f628527f0e88c07f35b30b5ca Author: Damjan Jovanovic Date: Tue Nov 28 04:44:42 2017 + Add the ability to set a linker script in gbuild that is used to version symbols. This has been a bottleneck in continued gbuild porting and should help further development considerably. Patch by: me diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index ec46b2836913..68c000d860c0 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -133,6 +133,7 @@ $(eval $(foreach method,\ add_package_headers \ add_sdi_headers \ add_precompiled_header \ + set_versionmap \ ,\ $(call gb_Library__forward_to_Linktarget,$(method))\ )) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b9c068e50825..18e79404a1aa 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -308,6 +308,8 @@ $(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_h # files. # - TARGETTYPE is the type of linktarget as some platforms need very different # command to link different targettypes. +# - VERSIONMAP is the linker script, usually used to version a dynamic +# library's symbols (on *nix/Mac). # # Since most variables are set on the linktarget and not on the object, the # object learns about these setting via GNU makes scoping of target variables. @@ -351,6 +353,7 @@ $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := $(call gb_LinkTarget_get_target,$(1)) : EXTERNAL_LIBS := $(call gb_LinkTarget_get_target,$(1)) : LIBS := $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := +$(call gb_LinkTarget_get_target,$(1)) : VERSIONMAP := $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(call gb_LinkTarget_get_target,$(1)) : PCHOBJS := @@ -373,6 +376,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULT $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := +$(call gb_LinkTarget_get_dep_target,$(1)) : VERSIONMAP := $(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME := endif @@ -681,6 +685,11 @@ $(call gb_LinkTarget_get_target,$(1)) \ $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(2) endef +define gb_LinkTarget_set_versionmap +$(call gb_LinkTarget_get_target,$(1)) \ +$(call gb_LinkTarget_get_dep_target,$(1)) : VERSIONMAP := $(2) +endef + define gb_LinkTarget_set_dlltarget $(call gb_LinkTarget_get_clean_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(2) diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk index 2c7c64f45ce1..8e1fe297b4e2 100644 --- a/solenv/gbuild/platform/freebsd.mk +++ b/solenv/gbuild/platform/freebsd.mk @@ -256,6 +256,7 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_CXX) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(if $(VERSIONMAP),$(gb_Library_VERSIONMAPFLAG) $(VERSIONMAP)) \ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ @@ -298,6 +299,7 @@ gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT) else gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT) endif +gb_Library_VERSIONMAPFLAG := -Wl,--version-script ifeq ($(CPUNAME),X86_64) gb_Library_OOOEXT := $(gb_Library_PLAINEXT) diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index a4098b4875a9..29d006244bc2 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -245,6 +245,7 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_CXX) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ + $(if $(VERSIONMAP),$(gb_Library_VERSIONMAPFLAG) $(VERSIONMAP)) \ $(subst \d,$$,$(RPATH)) \ $(T_LDFLAGS) \ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \ @@ -288,6 +289,7 @@ gb_Library_STLEXT := port_gcc$(gb_Library_PLAINEXT) else gb_Library_STLEXT := port_gcc_stldebug$(gb_Library_PLAINEXT) endif +gb_Library_VERSIONMAPFLAG := -Wl,--version-script ifeq ($(CPUNAME),X86_64) gb_Library_OOOEXT := $(gb_Library_PLAINEXT) diff
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - Module_ooo.mk rdbmaker/Executable_rdbmaker.mk rdbmaker/Makefile rdbmaker/Module_rdbmaker.mk rdbmaker/prj RepositoryFixes.mk Repository.mk sane/Make
Module_ooo.mk |3 ++ Repository.mk |2 + RepositoryFixes.mk |2 + rdbmaker/Executable_rdbmaker.mk | 58 rdbmaker/Makefile | 32 ++ rdbmaker/Module_rdbmaker.mk | 30 rdbmaker/prj/build.lst |6 rdbmaker/prj/d.lst |4 -- rdbmaker/prj/makefile.mk| 44 ++ sane/Makefile | 32 ++ sane/Module_sane.mk | 30 sane/Package_inc.mk | 26 + sane/prj/build.lst |3 -- sane/prj/d.lst |3 -- sane/prj/makefile.mk| 44 ++ 15 files changed, 305 insertions(+), 14 deletions(-) New commits: commit aace36ef4f70f9275be9a8143f0c7a0cbebfe5c7 Author: Damjan Jovanovic Date: Wed Nov 29 04:38:04 2017 + Port main/sane and main/rdbmaker to gbuild. Add reg to our known libraries (Windows implementation guessed). Update Module_ooo.mk with unixODBC too. Patch by: me diff --git a/Module_ooo.mk b/Module_ooo.mk index dce43be0f3a1..a0b3b1b65de0 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -59,8 +59,10 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ oox \ padmin \ package \ +rdbmaker \ reportdesign \ remotebridges \ +sane \ sax \ sc \ sccomp \ @@ -84,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ vbahelper \ vcl \ udm \ +unixODBC \ wizards \ writerfilter \ x11_extensions \ diff --git a/Repository.mk b/Repository.mk index c3242729a65e..a485eb47ffca 100644 --- a/Repository.mk +++ b/Repository.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ bmpsum \ g2g \ mkunroll \ +rdbmaker \ rscdep \ so_checksum \ srvdepy \ @@ -100,6 +101,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ oox \ package2 \ qstart_gtk \ +reg \ rpt \ rptui \ rptxml \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 70195f30f003..3b2295e133cc 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -83,6 +83,7 @@ gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst reg:reg%,reg:reg3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) @@ -141,6 +142,7 @@ gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAME gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst reg:reg%,reg:reg3%,$(gb_Library_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES)) gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES)) diff --git a/rdbmaker/Executable_rdbmaker.mk b/rdbmaker/Executable_rdbmaker.mk new file mode 100644 index ..c461ef0f4b14 --- /dev/null +++ b/rdbmaker/Executable_rdbmaker.mk @@ -0,0 +1,58 @@ +### +# +# 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 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +### + + + +$(eval $(call gb_Executable_Executable,rdbmaker)) + +$(eval $(call gb_Executable_add_api,rdbmaker,\ + udkapi \ +)) + +$(eval $(call gb_Executable_set_include,rdbmaker,
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/java
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
|2
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java
|4
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
|4
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java
|2
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLArray.java
|4
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLBlob.java
|4
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLCallableStatement.java
|1
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLClob.java
|4
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLConnection.java
| 78 +-
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLDatabaseMetaData.java
|7
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLPreparedStatement.java
|1
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLRef.java
|2
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLResultSetMetaData.java
|4
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatement.java
|3
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatementBase.java
|1
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ReaderInputStream.java
|2
connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/Tools.java
| 52 ++
17 files changed, 93 insertions(+), 82 deletions(-)
New commits:
commit 87e19c1cab7e6dd9ddd7cefdc670afd5ecb69df5
Author: Damjan Jovanovic
Date: Sat May 5 03:59:10 2018 +
Move the PropertyValue helper methods to the tools class for now.
Some "@Override" and "final" cleanups as per NetBeans.
Patch by: me
diff --git
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
index 07e8b6762d66..5336ba0e7312 100644
---
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
+++
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
public class BoundedInputStream extends InputStream {
-private InputStream is;
+private final InputStream is;
private long remaining;
public BoundedInputStream(InputStream is, long max) {
diff --git
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java
index fda4063ecdae..6bdd506af263 100644
--- a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java
+++ b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java
@@ -59,8 +59,8 @@ import com.sun.star.util.XMacroExpander;
*/
public class ClassMap {
public static class ClassLoaderAndClass {
-private ClassLoader classLoader;
-private Class classObject;
+private final ClassLoader classLoader;
+private final Class classObject;
public ClassLoaderAndClass(ClassLoader classLoader, Class
classObject) {
this.classLoader = classLoader;
diff --git
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
index 4feef8dac6ba..43bf01a7599a 100644
---
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
+++
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
@@ -21,8 +21,8 @@
package com.sun.star.comp.sdbc;
public class ContextClassLoaderScope implements AutoCloseable {
-private Thread currentThread;
-private ClassLoader oldClassLoader;
+private final Thread currentThread;
+private final ClassLoader oldClassLoader;
public ContextClassLoaderScope(ClassLoader classLoader) {
currentThread = Thread.currentThread();
diff --git
a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java
b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java
index 350c2a00c52d..6749bf874b32 100644
--- a/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java
+++ b/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java
@@ -44,7 +44,7 @@ public class JDBCDriver extends ComponentBase implements
XServiceInfo, XDriver {
"com.sun.star.sdbc.Driver"
};
private XComponentContext context;
-private ResourceBasedEventLogger logger;
+private final ResourceBasedEventLogger logger;
public static XSingleComponentFactory __getComponentFactory(String
implName) {
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst
extensions.lst | 60 - 1 file changed, 30 insertions(+), 30 deletions(-) New commits: commit 0414e43cc7386c9715ba7257774009a58f73bde2 Author: Damjan Jovanovic Date: Thu Jul 21 16:20:37 2016 + Revert r1736692. The given Sourceforge http:// URLs no longer work, and many buildbots have Perl's LWP::Protocol::https installed now and are breaking when --enable-bundled-dictionaries is used. Patch by: me diff --git a/extensions.lst b/extensions.lst index 4f859b1..efe09a9 100644 --- a/extensions.lst +++ b/extensions.lst @@ -39,115 +39,115 @@ # English dictionary [ language=en.* || language=de || language=it ] -f5f6aab4cc5d92a34ab13ad15332770c http://iweb.dl.sourceforge.net/project/aoo-extensions/17102/21/dict-en.oxt "dict-en.oxt" +f5f6aab4cc5d92a34ab13ad15332770c http://sourceforge.net/projects/aoo-extensions/files/17102/21/dict-en.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ] -e2eab80772ab1aa09716954219351a80 http://iweb.dl.sourceforge.net/project/aoo-extensions/1470/1/en_US.oxt "en_US.oxt" +e2eab80772ab1aa09716954219351a80 http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt" # German dictionary. [ language=de || language=de_DE || language=nl || language=ru ] -a9328ce36b272a034b4706721345076d http://iweb.dl.sourceforge.net/project/aoo-extensions/1075/13/dict-de_de-frami_2013-12-06.oxt "dict-de_DE-frami_2012-06-17.oxt" +a9328ce36b272a034b4706721345076d http://sourceforge.net/projects/aoo-extensions/files/1075/13/dict-de_de-frami_2013-12-06.oxt/download "dict-de_DE-frami_2012-06-17.oxt" # Dutch dictionary. [ language=nl ] -5c0de383ef649cffefc128cfb36b4d43 http://iweb.dl.sourceforge.net/project/aoo-extensions/1456/6/nl-dict-v2.00g.oxt "nl-dict-v2.00g.oxt" +5c0de383ef649cffefc128cfb36b4d43 http://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "nl-dict-v2.00g.oxt" # French dictionary. [ language=fr || language=nl || language=de || language=de_DE || language=ca || language=ca_XV ] -48343ddb4f020f1c335189ba56f8f50c http://iweb.dl.sourceforge.net/project/aoo-extensions/17340/3/lo-oo-ressources-linguistiques-fr-v5.1.oxt "dict-fr.oxt" +48343ddb4f020f1c335189ba56f8f50c http://sourceforge.net/projects/aoo-extensions/files/17340/3/lo-oo-ressources-linguistiques-fr-v5.1.oxt/download "dict-fr.oxt" # Italian dictionary. [ language=it || language=de || language=de_DE ] -b20c2bf3114bdca5749606ad707e19be http://iweb.dl.sourceforge.net/project/aoo-extensions/1204/14/dict-it.oxt "dict-it.oxt" +b20c2bf3114bdca5749606ad707e19be http://sourceforge.net/projects/aoo-extensions/files/1204/14/dict-it.oxt/download "dict-it.oxt" # Spanish dictionary. [ language=es || language=ca || language=ca_XV ] -59dd45e6785ed644adbbd73f4f126182 http://iweb.dl.sourceforge.net/project/aoo-extensions/1657/3/es_es.oxt "es_es.oxt" +59dd45e6785ed644adbbd73f4f126182 http://sourceforge.net/projects/aoo-extensions/files/1657/3/es_es.oxt/download "es_es.oxt" # Danish dictionary. [ language=da ] -b38cba04b6513dd42b031199d617cce6 http://iweb.dl.sourceforge.net/project/aoo-extensions/1388/12/DanskeSynonymer.oxt "DanskeSynonymer.oxt" -6ee1e24fb17e44577d8e3200f3e44adc http://iweb.dl.sourceforge.net/project/aoo-extensions/1429/6/dict-da-current.oxt "dict-da-current.oxt" +b38cba04b6513dd42b031199d617cce6 http://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt" +6ee1e24fb17e44577d8e3200f3e44adc http://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da-current.oxt" # Lithuanian dictionary. [ language=lt ] -d8d4a3d5c6abfde1b4c81cc1ddd1afa0 http://iweb.dl.sourceforge.net/project/aoo-extensions/17703/0/openoffice-spellcheck-lt-1.3.oxt "openoffice-spellcheck-lt-1.3.oxt" +d8d4a3d5c6abfde1b4c81cc1ddd1afa0 http://sourceforge.net/projects/aoo-extensions/files/17703/0/openoffice-spellcheck-lt-1.3.oxt/download "openoffice-spellcheck-lt-1.3.oxt" # Romanian dictionary. [ language=ro ] -b05941b975afc0321df0cd48a4d295c8 http://iweb.dl.sourceforge.net/project/aoo-extensions/1392/8/dict-ro.1.5.oxt "dict-ro.1.5.oxt" +b05941b975afc0321df0cd48a4d295c8 http://sourceforge.net/projects/aoo-extensions/files/1392/8/dict-ro.1.5.oxt/download "dict-ro.1.5.oxt" # Russian dictionary. [ language=ru ] -93921f14809a22770f1bd89af65015bc http://iweb.dl.sourceforge.net/project/aoo-extensions/3233/3/dict_ru_ru-0.3.7.oxt "dict-ru.oxt" +93921f14809a22770f1bd89af65015bc http://sourceforge.net/
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bootstrap.1 solenv/bin solenv/javadownloader
bootstrap.1 |8 +
solenv/bin/download_external_dependencies.pl | 98 +++-
solenv/bin/modules/ExtensionsLst.pm | 77 ++---
solenv/javadownloader/AOOJavaDownloader.java | 156 +++
4 files changed, 200 insertions(+), 139 deletions(-)
New commits:
commit 9813bbc278e11149aa0519750f2496f1b3d5ab89
Author: Damjan Jovanovic
Date: Sun Jul 24 15:53:36 2016 +
Give up on using Perl's LWP::UserAgent and LWP::Protocol::https to download
files during ./bootstrap. It's a nightmare to get it working on the
buildbots - Infra has been trying on INFRA-11296 for 5 months to get it
installed. Installing through CPAN doesn't always work - tests fail on
CentOS 5 and on Cygwin. Even when installed, it's not always found. The
gain just doesn't justify the effort. Worst of all, it's holding back
development.
What else is there? A CLI tool like wget could work, but it's not listed as
a dependency, and it breaks on CentOS 5 for https://, the thing it's needed
for most.
I instead re-implemented it in Java. Java is freely available, highly
portable, and rock solid. We already use it in the build, and it's
described as being a mandatory build requirement even though
./configure.ac treats it as optional. Best of all it supports https://
out of the box in java.net.URLConnection and uses its own root CA
certificates. Tests show my AOOJavaDownloader class works on FreeBSD and
Windows, supports HTTP redirection, and generally works like a charm.
Patch by: me
diff --git a/bootstrap.1 b/bootstrap.1
index 0981e5f..045b547 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -41,6 +41,14 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
# check perl include locations
"$PERL" -e 'print "\nInclude locations: @INC\n\n"';
+
+mkdir -p "$SOLARENV/$INPATH/class"
+"$JAVACOMPILER" "$SOLARENV/javadownloader/AOOJavaDownloader.java" -d
"$SOLARENV/$INPATH/class"
+if [ "$?" != "0" ]; then
+echo "*** Failed to build AOOJavaDownloader, aborting! ***"
+exit 1
+fi
+
"$PERL" "$SOLARENV/bin/download_external_dependencies.pl"
$SRC_ROOT/external_deps.lst
if [ "$?" != "0" ]; then
echo "*** Error downloading external dependencies, please fix the
previous problems and try again ***"
diff --git a/solenv/bin/download_external_dependencies.pl
b/solenv/bin/download_external_dependencies.pl
index 9db822b..ec68036 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -507,91 +507,39 @@ sub DownloadFile ($$$)
my $URL = shift;
my $checksum = shift;
-my $filename = File::Spec->catfile($ENV{'TARFILE_LOCATION'}, $name);
-
-my $temporary_filename = $filename . ".part";
-
-print "downloading to $temporary_filename\n";
-my $out;
-open $out, ">$temporary_filename";
-binmode($out);
-
-# Prepare checksum
-my $digest;
-if (defined $checksum && $checksum->{'type'} eq "SHA1")
-{
-# Use SHA1 only when explicitly requested (by the presence of a
"SHA1=..." line.)
-$digest = Digest::SHA->new("1");
-}
-elsif ( ! defined $checksum || $checksum->{'type'} eq "MD5")
-{
-# Use MD5 when explicitly requested or when no checksum type is given.
-$digest = Digest::MD5->new();
+if (defined $checksum)
+{
+system(
+$ENV{'JAVAINTERPRETER'},
+"-cp",
+File::Spec->catfile(
+File::Spec->catfile($ENV{'SOLARENV'}, $ENV{'INPATH'}),
+"class"),
+"AOOJavaDownloader",
+$name,
+$URL,
+$checksum->{'type'},
+$checksum->{'value'});
}
else
{
-die "checksum type ".$checksum->{'type'}." is not supported";
+system(
+$ENV{'JAVAINTERPRETER'},
+"-cp",
+File::Spec->catfile(
+File::Spec->catfile($ENV{'SOLARENV'}, $ENV{'INPATH'}),
+"class"),
+"AOOJavaDownloader",
+$name,
+$URL);
}
-# Download the extension.
-my $success = 0;
-
-my $agent = LWP::UserAgent->new();
-$agent->env_proxy;
-my $response = $agent->get($URL);
-
-$success = $response->is_su
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - bootstrap.1 solenv/bin
bootstrap.1 | 16
solenv/bin/download_external_dependencies.pl |6 +-
2 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 9650c1489ac9e210b04b728f98ac72b7a7155a89
Author: Damjan Jovanovic
Date: Wed Jul 27 17:22:09 2016 +
The AOOJavaDownloader may be necessary for downloading extensions
even if DO_FETCH_TARBALLS is disabled.
Patch by: me
diff --git a/bootstrap.1 b/bootstrap.1
index 045b547..faeb891 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -37,18 +37,18 @@ chmod +x "$SRC_ROOT/solenv/bin/build_client.pl"
chmod +x "$SRC_ROOT/solenv/bin/zipdep.pl"
chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
+# build the AOOJavaDownloader
+mkdir -p "$SOLARENV/$INPATH/class"
+"$JAVACOMPILER" "$SOLARENV/javadownloader/AOOJavaDownloader.java" -d
"$SOLARENV/$INPATH/class"
+if [ "$?" != "0" ]; then
+echo "*** Failed to build AOOJavaDownloader, aborting! ***"
+exit 1
+fi
+
# fetch or update external tarballs
if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
# check perl include locations
"$PERL" -e 'print "\nInclude locations: @INC\n\n"';
-
-mkdir -p "$SOLARENV/$INPATH/class"
-"$JAVACOMPILER" "$SOLARENV/javadownloader/AOOJavaDownloader.java" -d
"$SOLARENV/$INPATH/class"
-if [ "$?" != "0" ]; then
-echo "*** Failed to build AOOJavaDownloader, aborting! ***"
-exit 1
-fi
-
"$PERL" "$SOLARENV/bin/download_external_dependencies.pl"
$SRC_ROOT/external_deps.lst
if [ "$?" != "0" ]; then
echo "*** Error downloading external dependencies, please fix the
previous problems and try again ***"
commit b50546145d4d5bc6ed44d0539a6a3e62e03e783f
Author: Damjan Jovanovic
Date: Wed Jul 27 17:15:45 2016 +
Allow Ctrl+C to interrupt ./bootstrap.
Patch by: me
diff --git a/solenv/bin/download_external_dependencies.pl
b/solenv/bin/download_external_dependencies.pl
index ec68036..3990e34 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -538,10 +538,14 @@ sub DownloadFile ($$$)
{
return 1;
}
-else
+elsif ($? == 1)
{
return 0;
}
+else
+{
+exit $?;
+}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bootstrap.1 fetch_tarballs.sh
bootstrap.1 |2
fetch_tarballs.sh | 258 --
2 files changed, 1 insertion(+), 259 deletions(-)
New commits:
commit 90f47bb41c5c54cfd9935bcbc95ede1c0248d7be
Author: Damjan Jovanovic
Date: Wed Jul 27 22:52:02 2016 +
main/fetch_tarballs.sh was apparently migrated to the Perl (and now Java)
scripts a long time ago, and hasn't been used since at least AOO 3.4.
Goodbye.
Patch by: me
diff --git a/bootstrap.1 b/bootstrap.1
index faeb891..90d8f42 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -61,7 +61,7 @@ fi
if test -n "$DMAKE_URL" -a ! -x "$SOLARENV/$INPATH/bin/dmake$EXEEXT"; then
-# Assume that the dmake archive has been downloaded by fetch_tarballs.sh
+# Assume that the dmake archive has been downloaded
# Determine the name of the downloaded file.
dmake_package_name=`echo $DMAKE_URL | sed "s/^\(.*\/\)//"`
diff --git a/fetch_tarballs.sh b/fetch_tarballs.sh
deleted file mode 100755
index 427fca2..000
--- a/fetch_tarballs.sh
+++ /dev/null
@@ -1,258 +0,0 @@
-#!/usr/bin/env bash
-#**
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**
-
-file_list_name=$1
-
-if [ -z "$TARFILE_LOCATION" ]; then
-echo "ERROR: no destination defined! please set TARFILE_LOCATION!"
-exit
-fi
-
-if [ ! -d "$TARFILE_LOCATION" ]; then
-mkdir $TARFILE_LOCATION
-fi
-if [ ! -d "$TARFILE_LOCATION" ]; then
-echo "ERROR: can't create"
-exit
-fi
-
-if [ -z "$1" ]; then
-echo "ERROR: parameter missing!"
-echo "usage: $0 "
-echo "first line must define the base url."
-exit
-fi
-
-# Downloader method selection
-fetch_bin=
-fetch_args=
-
-#Look for FreeBSD's fetch(1) first
-if [ -x /usr/bin/fetch ]; then
-fetch_bin=/usr/bin/fetch
-fetch_args="-Fpr"
-echo found FreeBSD fetch: $fetch_bin
-else
- for wg in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget
/opt/sfw/bin/wget /opt/local/bin/wget; do
-eval "$wg --version" > /dev/null 2>&1
-ret=$?
-if [ $ret -eq 0 ]; then
-fetch_bin=$wg
-fetch_args="-nv -N"
-echo found wget at `which $fetch_bin`
-break 2
-fi
- done
- if [ -z "$fetch_bin" ]; then
-for c in curl /usr/bin/curl /usr/local/bin/curl /usr/sfw/bin/curl
/opt/sfw/bin/curl /opt/local/bin/curl; do
-# mac curl returns "2" on --version
-#eval "$i --version" > /dev/null 2>&1
-#ret=$?
-#if [ $ret -eq 0 ]; then
-if [ -x $c ]; then
-fetch_bin=$c
-fetch_args="$file_date_check -O"
-echo found curl at `which $fetch_bin`
-break 2
-fi
-done
- fi
- if [ -z "$fetch_bin" ]; then
-echo "ERROR: neither wget nor curl found!"
-exit
- fi
-fi
-
-#Checksummer selection
-md5sum=
-
-for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum
/opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
-if [ "$i" = "md5" ]; then
-eval "$i -x" > /dev/null 2>&1
-else
-eval "$i --version" > /dev/null 2>&1
-fi
-ret=$?
-if [ $ret -eq 0 ]; then
-md5sum=$i
-echo found md5sum at `which $md5sum`
-break 2
-fi
-done
-
-if [ "$md5sum" = "md5" ]; then
-md5special=-r
-fi
-
-if [ -z "$md5sum" ]; then
-echo "Warning: no md5sum: found!"
-fi
-
-start_dir=`pwd`
-logfile=$TARFILE_LOCATION/fetch.log
-date >> $logfile
-
-# Create and go to a temporary directory under the tar file destination.
-mkdir -p $TARFILE_LOCATION/tmp
-cd $TARFILE_LOCATION/tmp
-
-
-basename ()
-{
-echo $1 | sed "s/^\(.*\/\)//"
-}
-
-
-#
-# Download a file from a URL and add its md5 checksum to its name.
-#
-download ()
-{
-local URL=$1
-
-if [ -n "$
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/download_external_dependencies.pl |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit ad3e8774955aa8779ed5c4afbd5903f40e2d9c84
Author: Damjan Jovanovic
Date: Thu Jul 28 04:38:47 2016 +
Perl returns the exit code of a subprocess shifted right by 8 bits.
Shift it left before use.
Patch by: me
diff --git a/solenv/bin/download_external_dependencies.pl
b/solenv/bin/download_external_dependencies.pl
index 3990e34..ddef6dd 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -534,17 +534,18 @@ sub DownloadFile ($$$)
$URL);
}
-if ($? == 0)
+my $rc = $? >> 8;
+if ($rc == 0)
{
return 1;
}
-elsif ($? == 1)
+elsif ($rc == 1)
{
return 0;
}
else
{
-exit $?;
+exit $rc;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions/source
extensions/source/mozbootstrap/MNSProfileDiscover.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 002caf7f2a2505938e7e3c37ded4a501c3c05976
Author: Damjan Jovanovic
Date: Thu Jan 21 19:03:22 2016 +
#i125431# "The Password is incorrect. The file cannot be opened."
Fix handling of the "isRelative" option in Mozilla's profiles.ini files.
Patch by: Arrigo Marchiori
Review by: me
diff --git a/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
b/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
index ee7d43f..dc9cc55 100644
--- a/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
+++ b/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
@@ -123,9 +123,14 @@ namespace connectivity
{
isRelative = sIsRelative.toInt32();
}
+if (isRelative)
+{
+// Make it absolute
+profilePath = regDir + profilePath;
+}
ProfileStruct* profileItem = new
ProfileStruct(product,profileName,
-regDir + profilePath);
+profilePath);
m_Product.mProfileList[profileName] = profileItem;
sal_Int32 isDefault = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/qa
sal/qa/osl/file/osl_File_Const.h|3 --- sal/qa/osl/module/osl_Module_Const.h|3 --- sal/qa/osl/mutex/osl_Mutex.cxx |2 -- sal/qa/osl/process/osl_process.cxx |9 +++-- sal/qa/osl/process/osl_process_child.cxx| 15 ++- sal/qa/osl/security/osl_Security_Const.h|4 sal/qa/osl/socket/osl_Socket_Const.h|3 --- sal/qa/osl/socket/osl_Socket_Const_orig.h |3 --- sal/qa/osl/socket/sockethelper.hxx |3 --- sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx |2 -- sal/qa/rtl/digest/rtl_digest.cxx|2 +- sal/qa/rtl/doublelock/rtl_doublelocking.cxx |2 -- sal/qa/rtl/logfile/rtl_logfile.cxx |5 - sal/qa/rtl/uuid/rtl_Uuid.cxx|2 -- 14 files changed, 10 insertions(+), 48 deletions(-) New commits: commit 729d1c1df8068f36cc44c0e6a12241338ebf774e Author: Damjan Jovanovic Date: Thu Jan 28 18:04:22 2016 + #i126787# fix unit tests on Windows Fix a regression caused by r1710853 and which always existed in some files, where and were being included before and after , yet unavailable as the tools module isn't built (and can't be) before sal. Patch by: j.nitschke at ok.de Review by: me diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index 0e839d6..2bb52a5 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -107,13 +107,10 @@ const sal_Char pBuffer_Blank[] = ""; # define PATH_SEPERATOR "/" #endif #if (defined WNT ) // Windows -#include -// #include # include # include # include # include -#include # define PATH_MAX MAX_PATH # define TEST_PLATFORM"c:/" # define TEST_PLATFORM_ROOT "c:/" diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 3eb90e7..8071a69 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -35,10 +35,7 @@ # include #endif #if ( defined WNT ) // Windows -#include -// #include # include -#include #endif # define FILE_PREFIX "file:///" diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index 55ed5cc..b187494 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -31,10 +31,8 @@ #include #ifdef WNT -#include #define WIN32_LEAN_AND_MEAN #include -#include #endif using namespace osl; diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 0c1ee9f..e0b3f44 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -36,12 +36,9 @@ #include #include -#if ( defined WNT ) // Windows -#include -# define WIN32_LEAN_AND_MEAN -// #include -# include -#include +#ifdef WNT // Windows +#define WIN32_LEAN_AND_MEAN +#include #endif #include diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx index 57e6be2..dfe7614 100644 --- a/sal/qa/osl/process/osl_process_child.cxx +++ b/sal/qa/osl/process/osl_process_child.cxx @@ -27,16 +27,13 @@ // // includes -#if ( defined WNT ) // Windows -#include -# define UNICODE -# define _UNICODE -# define WIN32_LEAN_AND_MEAN -// #include -# include -#include +#ifdef WNT // Windows +#define UNICODE +#define _UNICODE +#define WIN32_LEAN_AND_MEAN +#include #else -# include +#include #endif #include diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h index f68839d..c1909d0 100644 --- a/sal/qa/osl/security/osl_Security_Const.h +++ b/sal/qa/osl/security/osl_Security_Const.h @@ -28,11 +28,7 @@ #define _OSL_SECURITY_CONST_H_ #if ( defined WNT ) // Windows -//#define UNICODE -#include -// #include #include -#include #endif // diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index 63aa45a..3696cb4 100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -86,11 +86,8 @@ extern "C" # include #endif #if ( defined WNT ) // Windows -#include -// #include # include # include -#include #endif diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h index 5f8e367..cbaa9d7 100644 --- a/sal/qa/osl/socket/osl_Socket_Const_orig.h +++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h @@ -86,11 +86,8 @@ extern "C" # include #endif #if ( defined WNT ) // Windows -#include -// #inc
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/qa
0 files changed New commits: commit 561f3f4431baa22cde5597dafdb8427b7ed3875f Author: Damjan Jovanovic Date: Fri Jan 29 01:08:46 2016 + Remove an unused empty file that is causing the RAT scan to fail. Patch by: me diff --git a/sal/qa/ByteSequence/main.cxx b/sal/qa/ByteSequence/main.cxx deleted file mode 100644 index e69de29..000 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmlsecurity/source
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 51e9a26e702cdbdeb864844b5092d7f24ba28141
Author: Damjan Jovanovic
Date: Wed Feb 3 01:38:46 2016 +
AOO crashes when PR_GetErrorText() in xmlsecurity is called with a null
pointer, as that function actually expects a PR_GetErrorTextLength() + 1
sized buffer. Use it correctly.
Patch by: me
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index f973e79..93d6286 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -265,11 +265,13 @@ bool nsscrypto_initialize( const css::uno::Reference<
css::lang::XMultiServiceFa
if( NSS_InitReadWrite( sCertDir.getStr() ) != SECSuccess )
{
xmlsec_trace("Initializing NSS with profile failed.");
-char * error = NULL;
-
+PRInt32 errorLength = PR_GetErrorTextLength();
+char *error = new char[errorLength + 1];
+error[0] = '\0'; // as per
https://bugzilla.mozilla.org/show_bug.cgi?id=538940
PR_GetErrorText(error);
-if (error)
+if (error[0])
xmlsec_trace("%s",error);
+delete[] error;
return false ;
}
}
@@ -279,10 +281,13 @@ bool nsscrypto_initialize( const css::uno::Reference<
css::lang::XMultiServiceFa
if ( NSS_NoDB_Init(NULL) != SECSuccess )
{
xmlsec_trace("Initializing NSS without profile failed.");
-char * error = NULL;
+PRInt32 errorLength = PR_GetErrorTextLength();
+char *error = new char[errorLength + 1];
+error[0] = '\0';
PR_GetErrorText(error);
-if (error)
+if (error[0])
xmlsec_trace("%s",error);
+delete[] error;
return false ;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bootstrap.1 solenv/bin
bootstrap.1 |4
solenv/bin/download_external_dependencies.pl |7 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 6dd7f9fe60b7dab8dfcd421f0d3af39a4f1ab1cc
Author: Damjan Jovanovic
Date: Sat Feb 6 11:51:01 2016 +
Exit the "./bootstrap" step with an error if some dependencies could not be
downloaded. If dependencies fail to download, the build usually fails later.
This is apparent on our buildbots. Rather catch it early.
Patch by: me
diff --git a/bootstrap.1 b/bootstrap.1
index 2b2ce73..572a2e8 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -40,6 +40,10 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
# fetch or update external tarballs
if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
"$PERL" "$SOLARENV/bin/download_external_dependencies.pl"
$SRC_ROOT/external_deps.lst
+if [ "$?" != "0" ]; then
+echo "*** Error downloading external dependencies, please fix the
previous problems and try again ***"
+exit 1
+fi
fi
#
--
diff --git a/solenv/bin/download_external_dependencies.pl
b/solenv/bin/download_external_dependencies.pl
index 278e0937..5cc5a25 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -471,20 +471,25 @@ sub Download ()
}
# Download the missing files.
+my $all_downloaded = 1;
for my $item (@Missing)
{
my ($name, $checksum, $urls) = @$item;
+my $downloaded = 0;
foreach my $url (@$urls)
{
-last if DownloadFile(
+$downloaded = DownloadFile(
defined $checksum
? $checksum->{'value'}."-".$name
: $name,
$url,
$checksum);
+last if $downloaded
}
+$all_downloaded &&= $downloaded;
}
+die "some needed files could not be downloaded!" if !$all_downloaded;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/pipe.c | 22 +-
sal/osl/unx/sockimpl.h |2 +-
2 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit e18ecd4f644cfbe5d6b871c7ff6c76bd5c220504
Author: Damjan Jovanovic
Date: Sat Feb 6 19:07:51 2016 +
Platforms that need CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT for sockets usually
need it for pipes too, and even if it isn't necessary it can't hurt.
In particular, on FreeBSD 11-CURRENT it seems pipes no longer wake up
from accept when closed in other threads, so let's deal with that before
FreeBSD 11 is released.
Reported by: Matthias Apitz
Patch by: me
Tested by: Matthias Apitz
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index eb2e5fc..43a21a0 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -115,7 +115,7 @@ oslPipe __osl_createPipeImpl()
pPipeImpl = (oslPipe)calloc(1, sizeof(struct oslPipeImpl));
pPipeImpl->m_nRefCount =1;
pPipeImpl->m_bClosed = sal_False;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipeImpl->m_bIsInShutdown = sal_False;
pPipeImpl->m_bIsAccepting = sal_False;
#endif
@@ -321,7 +321,7 @@ void SAL_CALL osl_releasePipe( oslPipe pPipe )
void SAL_CALL osl_closePipe( oslPipe pPipe )
{
int nRet;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
size_t len;
struct sockaddr_un addr;
int fd;
@@ -341,10 +341,10 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
ConnFD = pPipe->m_Socket;
/*
- Thread does not return from accept on linux, so
+ Thread does not return from accept on some operating systems, so
connect to the accepting pipe
*/
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
if ( pPipe->m_bIsAccepting )
{
pPipe->m_bIsInShutdown = sal_True;
@@ -356,7 +356,11 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, pPipe->m_Name, sizeof(addr.sun_path));
+#if defined(FREEBSD)
+len = SUN_LEN(&addr);
+#else
len = sizeof(addr);
+#endif
nRet = connect( fd, (struct sockaddr *)&addr, len);
#if OSL_DEBUG_LEVEL > 1
@@ -367,7 +371,7 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
#endif /* OSL_DEBUG_LEVEL */
close(fd);
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
nRet = shutdown(ConnFD, 2);
@@ -408,13 +412,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
OSL_ASSERT(strlen(pPipe->m_Name) > 0);
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipe->m_bIsAccepting = sal_True;
#endif
s = accept(pPipe->m_Socket, NULL, NULL);
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipe->m_bIsAccepting = sal_False;
#endif
@@ -424,13 +428,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
return NULL;
}
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
if ( pPipe->m_bIsInShutdown )
{
close(s);
return NULL;
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
else
{
/* alloc memory */
diff --git a/sal/osl/unx/sockimpl.h b/sal/osl/unx/sockimpl.h
index 904190f..2e80c9f 100644
--- a/sal/osl/unx/sockimpl.h
+++ b/sal/osl/unx/sockimpl.h
@@ -63,7 +63,7 @@ struct oslPipeImpl {
sal_Char m_Name[PATH_MAX + 1];
oslInterlockedCount m_nRefCount;
sal_Bool m_bClosed;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
sal_Bool m_bIsAccepting;
sal_Bool m_bIsInShutdown;
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/prj
connectivity/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ceb634a02b57acb2044e5581d5903b0f646e3623 Author: Damjan Jovanovic Date: Sun Feb 7 14:06:28 2016 + The main/connectivity module doesn't depend on nss any more. This was probably a remnant from the days when the Mozilla address book was a database driver we supported. Patch by: me diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 81e9d6a..1bcbfa4 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity:shell L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL +cn connectivity:shell L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg LIBXSLT:libxslt NULL cn connectivityusr1- all cn_mkout NULL cn connectivity\incnmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/pipe.cxx | 14 +++---
sal/osl/unx/sockimpl.hxx |2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit ed983eb5ce71d0b9af07795eabd8686f24c4597e
Author: Damjan Jovanovic
Date: Sat Feb 6 19:07:51 2016 +
Platforms that need CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT for sockets usually
need it for pipes too, and even if it isn't necessary it can't hurt.
In particular, on FreeBSD 11-CURRENT it seems pipes no longer wake up
from accept when closed in other threads, so let's deal with that before
FreeBSD 11 is released.
Reported by: Matthias Apitz
Patch by: me
Tested by: Matthias Apitz
(cherry picked from commit e18ecd4f644cfbe5d6b871c7ff6c76bd5c220504)
Change-Id: I1b4c0438fbcc2ea53625f235906936fc1403e195
diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index b598ddc..9321395 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -82,7 +82,7 @@ oslPipe __osl_createPipeImpl()
return nullptr;
pPipeImpl->m_nRefCount =1;
pPipeImpl->m_bClosed = false;
-#if defined(LINUX)
+#if defined(CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT)
pPipeImpl->m_bIsInShutdown = false;
pPipeImpl->m_bIsAccepting = false;
#endif
@@ -359,7 +359,7 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
Thread does not return from accept on linux, so
connect to the accepting pipe
*/
-#if defined(LINUX)
+#if defined(CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT)
struct sockaddr_un addr;
if ( pPipe->m_bIsAccepting )
@@ -387,7 +387,7 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
}
close(fd);
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
nRet = shutdown(ConnFD, 2);
if ( nRet < 0 )
@@ -421,13 +421,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
OSL_ASSERT(strlen(pPipe->m_Name) > 0);
-#if defined(LINUX)
+#if defined(CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT)
pPipe->m_bIsAccepting = true;
#endif
s = accept(pPipe->m_Socket, nullptr, nullptr);
-#if defined(LINUX)
+#if defined(CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT)
pPipe->m_bIsAccepting = false;
#endif
@@ -437,13 +437,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
return nullptr;
}
-#if defined(LINUX)
+#if defined(CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT)
if ( pPipe->m_bIsInShutdown )
{
close(s);
return nullptr;
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
else
{
/* alloc memory */
diff --git a/sal/osl/unx/sockimpl.hxx b/sal/osl/unx/sockimpl.hxx
index 900155c..0b702c6 100644
--- a/sal/osl/unx/sockimpl.hxx
+++ b/sal/osl/unx/sockimpl.hxx
@@ -48,7 +48,7 @@ struct oslPipeImpl {
sal_Char m_Name[PATH_MAX + 1];
oslInterlockedCount m_nRefCount;
bool m_bClosed;
-#if defined(LINUX)
+#if defined(CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT)
bool m_bIsAccepting;
bool m_bIsInShutdown;
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/modules/installer/systemactions.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6efa10d535351216e97c3a736a17ea9f597482b5
Author: Damjan Jovanovic
Date: Sun Jun 5 09:40:50 2016 +
#i126736#: fix typo in systemactions.pm
Remove stray backslashes in warning messages in systemactions.pm which
cause warnings.
Patch by: j.nitsc...@ok.de
Reviewed by: me
diff --git a/solenv/bin/modules/installer/systemactions.pm
b/solenv/bin/modules/installer/systemactions.pm
index d857ba7..181ac8b 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -91,7 +91,7 @@ sub create_directory
}
else
{
-$infoline = "\Error: \"$directory\" could not be
created. Even the parent directory \"$parentdir\" does not exist and could not
be created.\n";
+$infoline = "Error: \"$directory\" could not be
created. Even the parent directory \"$parentdir\" does not exist and could not
be created.\n";
$installer::logger::Lang->print($infoline);
if ( -d $parentdir )
{
@@ -211,7 +211,7 @@ sub create_directory_with_privileges
}
else
{
-$infoline = "\Error: \"$directory\" could not be
created. Even the parent directory \"$parentdir\" does not exist and could not
be created.\n";
+$infoline = "Error: \"$directory\" could not be
created. Even the parent directory \"$parentdir\" does not exist and could not
be created.\n";
$installer::logger::Lang->print($infoline);
if ( -d $parentdir )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source
svtools/source/filter/exportdialog.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 48cf17d5fac7e77aa82caa454cd0f26cd10faaa0
Author: Damjan Jovanovic
Date: Sun Jun 5 12:51:04 2016 +
#i124867#: jpg options shows initially wrong estimated file size
File main/svtools/source/filter/exportdialog.cxx
ExportDialog::GetGraphicStream() creates the compressed file from which the
file size is obtained, calling GetFilterData() to obtain the properties used
to save it. GetFilterData() returns image properties, like JPEG colormode
and quality, PNG compression/interlacing/translucence, BMP color and RLE
coding, etc. In the case of JPEG, the quality is read from
maSbCompression.GetThumbPos().
The problem is that in ExportDialog::updateControls(),
maSbCompression.SetThumbPos() is called AFTER GetGraphicStream(), meaning
the stream is created with the old thumb position.
This patches it to call GetGraphicStream() later, immediately before using
that stream, so that its properties such as compression are updated first
and the size is calculated correctly.
Reported by: myspaces at hotmail dot fr
Patch by: me
diff --git a/svtools/source/filter/exportdialog.cxx
b/svtools/source/filter/exportdialog.cxx
index 2acf276..61c7e04 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -1313,8 +1313,6 @@ void ExportDialog::updatePreview()
void ExportDialog::updateControls()
{
-GetGraphicStream();
-
// Size Controls
if ( !mbIsPixelFormat )
{
@@ -1364,6 +1362,8 @@ void ExportDialog::updateControls()
if ( maSbCompression.IsVisible() )
maSbCompression.SetThumbPos( maNfCompression.GetValue() );
+GetGraphicStream();
+
// updating estimated size
sal_Int64 nRealFileSize( mpTempStream->Tell() );
if ( mbIsPixelFormat )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/filter/exportdialog.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b3f1afc28fa537e6d4ff15de457a4a9dc4af809e
Author: Damjan Jovanovic
Date: Sun Jun 5 12:51:04 2016 +
#i124867#: jpg options shows initially wrong estimated file size
File main/svtools/source/filter/exportdialog.cxx
ExportDialog::GetGraphicStream() creates the compressed file from which the
file size is obtained, calling GetFilterData() to obtain the properties used
to save it. GetFilterData() returns image properties, like JPEG colormode
and quality, PNG compression/interlacing/translucence, BMP color and RLE
coding, etc. In the case of JPEG, the quality is read from
maSbCompression.GetThumbPos().
The problem is that in ExportDialog::updateControls(),
maSbCompression.SetThumbPos() is called AFTER GetGraphicStream(), meaning
the stream is created with the old thumb position.
This patches it to call GetGraphicStream() later, immediately before using
that stream, so that its properties such as compression are updated first
and the size is calculated correctly.
Reported by: myspaces at hotmail dot fr
Patch by: me
(cherry picked from commit 48cf17d5fac7e77aa82caa454cd0f26cd10faaa0)
diff --git a/svtools/source/filter/exportdialog.cxx
b/svtools/source/filter/exportdialog.cxx
index 5c06d6a..6473791 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -835,8 +835,6 @@ static OUString ImpValueOfInKB( const sal_Int64& rVal )
void ExportDialog::updateControls()
{
-GetGraphicStream();
-
// Size Controls
if ( !mbIsPixelFormat )
{
@@ -886,6 +884,8 @@ void ExportDialog::updateControls()
if (mpSbCompression && mpSbCompression->IsVisible() && mpNfCompression)
mpSbCompression->SetThumbPos(mpNfCompression->GetValue());
+GetGraphicStream();
+
// updating estimated size
sal_Int64 nRealFileSize( mpTempStream->Tell() );
if ( mbIsPixelFormat )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - connectivity/inc connectivity/source
connectivity/inc/connectivity/sqlparse.hxx | 11 ++-
connectivity/source/parse/sqlnode.cxx | 15 ++-
2 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 2c0ab85572965aa49e6c8645c00578ee317411e9
Author: Damjan Jovanovic
Date: Wed Jun 8 19:42:58 2016 +
#i126917# windows build breaks in module
connectivity/source/parse/sqliterator.cxx
Fix a *nix build breaker from my 2 previous commits.
Patch by: me
diff --git a/connectivity/inc/connectivity/sqlparse.hxx
b/connectivity/inc/connectivity/sqlparse.hxx
index 16705f2..445f8e6 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -137,7 +137,7 @@ namespace connectivity
::com::sun::star::lang::Locale aLocale;
::connectivity::SQLErroraErrors;
-::connectivity::OSQLParser_Data( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory
>& _xServiceFactory );
+OSQLParser_Data( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory );
};
/** Parser for SQL92
commit 606c0d90a51178db4ea452eb55b1e6a0b734ab7d
Author: Damjan Jovanovic
Date: Wed Jun 8 19:28:02 2016 +
#i126917# windows build breaks in module
connectivity/source/parse/sqliterator.cxx
Fix compile errors in Patricia's patch in #1747439.
Patch by: me
diff --git a/connectivity/inc/connectivity/sqlparse.hxx
b/connectivity/inc/connectivity/sqlparse.hxx
index a489422..16705f2 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -137,7 +137,7 @@ namespace connectivity
::com::sun::star::lang::Locale aLocale;
::connectivity::SQLErroraErrors;
-::connectivity::OSQLParser_Data( const Reference< XMultiServiceFactory
>& _xServiceFactory );
+::connectivity::OSQLParser_Data( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory
>& _xServiceFactory );
};
/** Parser for SQL92
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index e828b45..d9c91da 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -148,16 +148,13 @@ namespace connectivity
{
//=
-struct OSQLParser_Data
+//= OSQLParser_Data
+//=
+//-
+OSQLParser_Data::OSQLParser_Data( const Reference< XMultiServiceFactory >&
_xServiceFactory )
+:aErrors( _xServiceFactory )
{
-::com::sun::star::lang::Locale aLocale;
-::connectivity::SQLErroraErrors;
-
-OSQLParser_Data( const Reference< XMultiServiceFactory >& _xServiceFactory
)
-:aErrors( _xServiceFactory )
-{
-}
-};
+}
//=
//= SQLParseNodeParameter
commit 89b86d9fa3254051752815cfcdd40ae0916ddde4
Author: Damjan Jovanovic
Date: Wed Jun 8 19:19:50 2016 +
#i126917# windows build breaks in module
connectivity/source/parse/sqliterator.cxx
Commit Patricia's initial broken patch which starts in the right direction,
and fix it in my next commit.
Patch by: pats
Review by: me
diff --git a/connectivity/inc/connectivity/sqlparse.hxx
b/connectivity/inc/connectivity/sqlparse.hxx
index 53ee457..a489422 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -37,8 +37,10 @@
#include
#include
#include
+#include
#include "connectivity/IParseContext.hxx"
#include "connectivity/dbtoolsdllapi.hxx"
+#include "connectivity/sqlerror.hxx"
#include
#include
@@ -130,7 +132,14 @@ namespace connectivity
//==
//= OSQLParser
//==
-struct OSQLParser_Data;
+struct OSQLParser_Data
+{
+::com::sun::star::lang::Locale aLocale;
+::connectivity::SQLErroraErrors;
+
+::connectivity::OSQLParser_Data( const Reference< XMultiServiceFactory
>& _xServiceFactory );
+
+};
/** Parser for SQL92
*/
class OOO_DLLPUBLIC_DBTOOLS OSQLParser
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - solenv/gbuild
solenv/gbuild/GoogleTest.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit e3078772c4366e1bc09aa1fbbe0bdd80256ebb89 Author: Damjan Jovanovic Date: Fri Jun 10 17:34:38 2016 + Fix a typo in my last patch. Patch by: me diff --git a/solenv/gbuild/GoogleTest.mk b/solenv/gbuild/GoogleTest.mk index 90df2a5..d52178c 100644 --- a/solenv/gbuild/GoogleTest.mk +++ b/solenv/gbuild/GoogleTest.mk @@ -27,7 +27,7 @@ # in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell DBGSV_ERROR_OUT := shell export DBGSV_ERROR_OUT -DISABLE_SAL_DBGBOX=1 +DISABLE_SAL_DBGBOX := 1 export DISABLE_SAL_DBGBOX # defined by platform commit dc8b714d2345e42b48a09cbd6affe74c6994b5fc Author: Damjan Jovanovic Date: Fri Jun 10 17:31:51 2016 + #i126918# - windows build breaks in module crashrep - Assertion Failed Prevent OSL assertion failures from bringing up messageboxes during the build on Windows. Patch by: me diff --git a/solenv/gbuild/GoogleTest.mk b/solenv/gbuild/GoogleTest.mk index b8cf828..90df2a5 100644 --- a/solenv/gbuild/GoogleTest.mk +++ b/solenv/gbuild/GoogleTest.mk @@ -27,6 +27,8 @@ # in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell DBGSV_ERROR_OUT := shell export DBGSV_ERROR_OUT +DISABLE_SAL_DBGBOX=1 +export DISABLE_SAL_DBGBOX # defined by platform # gb_CppunitTest_TARGETTYPE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - formula/Library_forui.mk
formula/Library_forui.mk |2 -- 1 file changed, 2 deletions(-) New commits: commit 9e591c454e9bcd4dc6d018bf20d14f0909e988f9 Author: Damjan Jovanovic Date: Sun Jun 12 08:35:49 2016 + #i126916# windows build breaks in module formula Don't use precompiled headers for forui, as it sometimes breaks the Windows build. Patch by: me diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk index 8d6328c..0b6f5b0 100644 --- a/formula/Library_forui.mk +++ b/formula/Library_forui.mk @@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,forui)) $(eval $(call gb_Library_add_package_headers,forui,formula_inc)) -$(eval $(call gb_Library_add_precompiled_header,forui,$(SRCDIR)/formula/inc/pch/precompiled_formula)) - $(eval $(call gb_Library_set_include,forui,\ $$(INCLUDE) \ -I$(SRCDIR)/formula/inc \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - icu/icu-win-layoutex.patch icu/makefile.mk
icu/icu-win-layoutex.patch | 10 ++
icu/makefile.mk|2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 2582d1371078e91155a13f1907089a1bb0c18365
Author: Damjan Jovanovic
Date: Thu Feb 11 23:06:27 2016 +
#i126840# - Windows/MSVC build often fails in main/icu
The build script (used only on MSVC, not MingW or other OSes) for icu
generates nmake makefiles for the build using icu's
source/allinone/allinone.sln, in which layoutex doesn't list a dependency
on i18n, despite linking to icuin.lib from i18n, which sporadically causes
the icu build to fail. This is really an upstream bug, however upstream
doesn't build using allinone.sln so we are affected more.
This patch declares the missing dependecy, and makes icu build reliably.
Patch by: me
Tested by: pats
diff --git a/icu/icu-win-layoutex.patch b/icu/icu-win-layoutex.patch
new file mode 100644
index 000..44387fa
--- /dev/null
+++ b/icu/icu-win-layoutex.patch
@@ -0,0 +1,10 @@
+--- misc/build/icu/source/allinone/allinone.sln2009-01-15
09:46:06.0 +0200
misc/build/icu/source/allinone/allinone.sln2016-02-11
01:00:15.492392000 +0200
+@@ -114,6 +114,7 @@
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "layoutex",
"..\layoutex\layoutex.vcproj", "{37FC2C7F-1904-4811-8955-2F478830EAD1}"
+ ProjectSection(ProjectDependencies) = postProject
++ {0178B127-6269-407D-B112-93877BB62776} =
{0178B127-6269-407D-B112-93877BB62776}
+ {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} =
{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}
+ {C920062A-0647-4553-A3B2-37C58065664B} =
{C920062A-0647-4553-A3B2-37C58065664B}
+ EndProjectSection
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 09da718..7129c50 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -42,7 +42,7 @@ TARFILE_MD5=
.ENDIF
TARFILE_ROOTDIR=icu
-PATCH_FILES=${TARFILE_NAME}.patch icu-mp.patch
+PATCH_FILES=${TARFILE_NAME}.patch icu-mp.patch icu-win-layoutex.patch
# ADDITIONAL_FILES=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst
external_deps.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7ce8b7f08c7f8e468accd181d3859b56e1ae25d8 Author: Damjan Jovanovic Date: Sat Feb 13 06:33:35 2016 + Fix the upstream URL for vigra in external_deps.lst Patch by: me diff --git a/external_deps.lst b/external_deps.lst index d480f22..8110c44 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -218,7 +218,7 @@ if (SYSTEM_BOOST != YES) if (SYSTEM_VIGRA != YES) MD5 = d62650a6f908e85643e557a236ea989c name = vigra1.6.0.tar.gz -URL1 = http://hci.iwr.uni-heidelberg.de/vigra/vigra1.6.0.tar.gz +URL1 = http://hci.iwr.uni-heidelberg.de/vigra-old-versions/vigra1.6.0.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_EXPAT != YES) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/core/data/document.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 71de3699a30267d989ef78096477d9ecca329974
Author: Damjan Jovanovic
Date: Wed Feb 17 00:03:50 2016 +
#i118023# Calc: Cut-and-paste between spreadsheets causes incorrect cell
reference changes
When pasting cut cells, Calc updates references to their old positions
to instead refer to their new positions. This is done using the tab index,
row and column, however the document is not taken into account. As a result,
when cutting and pasting between documents, cells in the target document
end up getting changed instead of in the source, potentially leading to
formula corruption, which is undoable but could easily go unnoticed,
causing data loss when the document is saved.
We don't really support inter-document reference updates anyway, so fix
this bug by restricting reference updates to the intra-document cut and
paste case only.
Patch by: me
Reviewed by: kschenk
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 2aefa7a..0ccf481 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1965,7 +1965,8 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW
nRow1,
nClipTab = (nClipTab+1) % (MAXTAB+1);
}
}
-if ( pCBFCP->nInsFlag & IDF_CONTENTS )
+if ( (pCBFCP->nInsFlag & IDF_CONTENTS) &&
+(pCBFCP->pClipDoc->GetClipParam().getSourceDocID() ==
GetDocumentID()) ) // #118023# only update references for *intra-document* cut
and paste
{
nClipTab = 0;
for (SCTAB i = pCBFCP->nTabStart; i <= nTabEnd; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/AllLangResTarget_svx.mk svx/Package_inc.mk
svx/AllLangResTarget_svx.mk | 12 +--- svx/Package_inc.mk |1 - 2 files changed, 9 insertions(+), 4 deletions(-) New commits: commit bcf075eb572f1595b0144097877ad787e16edf99 Author: Damjan Jovanovic Date: Fri Feb 19 17:16:19 2016 + Merge r1409397 from branches/gbuild: #i117685# own copy target for globlmn.hrc Build updates by: me diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 7aa9bf5..fd9aeb9 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -106,9 +106,6 @@ $(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(WORKDIR)/in $(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(WORKDIR)/inc/svx/globlmn.hrc $(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_clean -$(OUTDIR)/inc/svx/globlmn.hrc : $(WORKDIR)/inc/svx/globlmn.hrc - $(call gb_Deliver_deliver,$<,$@) - # hack !!! # just a temporary - globlmn.hrc about to be removed! ifeq ($(strip $(WITH_LANG)),) @@ -138,5 +135,14 @@ $(WORKDIR)/inc/svx/globlmn.hrc_clean : rm -f $(WORKDIR)/inc/svx/lastrun.mk \ $(WORKDIR)/inc/svx/globlmn.hrc +$(OUTDIR)/inc/svx/globlmn.hrc : $(WORKDIR)/inc/svx/globlmn.hrc + $(call gb_Deliver_deliver,$<,$@) + +.PHONY : $(OUTDIR)/inc/svx/globlmn.hrc_clean +$(OUTDIR)/inc/svx/globlmn.hrc_clean : + rm -f $(OUTDIR)/inc/svx/globlmn.hrc + +$(call gb_AllLangResTarget_get_target,svx) : $(OUTDIR)/inc/svx/globlmn.hrc + # vim: set noet sw=4 ts=4: diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index bf583b7..fda28d5 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -133,7 +133,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/galleryitem.hxx,svx/galleryite $(eval $(call gb_Package_add_file,svx_inc,inc/svx/galmisc.hxx,svx/galmisc.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/galtheme.hxx,svx/galtheme.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/globl3d.hxx,svx/globl3d.hxx)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/grafctrl.hxx,svx/grafctrl.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphctl.hxx,svx/graphctl.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/download_external_dependencies.pl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9825e795eca5a633a169e8e8511b9215be102762
Author: Damjan Jovanovic
Date: Fri Feb 19 22:58:06 2016 +
Log the HTTP status when a download in ./bootstrap fails.
Patch by: me
diff --git a/solenv/bin/download_external_dependencies.pl
b/solenv/bin/download_external_dependencies.pl
index 5cc5a25..9db822b 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -551,7 +551,7 @@ sub DownloadFile ($$$)
}
else
{
-print "download from $URL failed\n";
+print "download from $URL failed (" . $response->status_line . ")\n";
}
close($out);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source
dbaccess/source/ui/app/app.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8df1c30b7f5e79c2757e7224677f9a487b1bed0a
Author: Damjan Jovanovic
Date: Sun Nov 6 16:42:58 2016 +
#i119892# Missing "by" in description
Fixes spelling errors in some Base messages.
Reported by: Dwayne Henderson
Patch by: me
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 05f3524..5f67dea 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -306,11 +306,11 @@ String RID_STR_FORMS_HELP_TEXT_WIZARD
};
String RID_STR_QUERIES_HELP_TEXT
{
-Text [ en-US ] = "Create a query by specifying the filters, input tables,
field names, and properties for sorting or grouping." ;
+Text [ en-US ] = "Create a query by specifying the filters, input tables,
field names, and properties for sorting or grouping." ;
};
String RID_STR_QUERIES_HELP_TEXT_SQL
{
-Text [ en-US ] = "Create a query entering an SQL statement directly." ;
+Text [ en-US ] = "Create a query by entering an SQL statement directly." ;
};
String RID_STR_QUERIES_HELP_TEXT_WIZARD
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/app/app.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 028cc38a164493c5049d152eae38a34218428fce
Author: Damjan Jovanovic
Date: Sun Nov 6 16:42:58 2016 +
Resolves: #i119892# Missing "by" in description
Fixes spelling errors in some Base messages.
Reported by: Dwayne Henderson
Patch by: me
(cherry picked from commit 8df1c30b7f5e79c2757e7224677f9a487b1bed0a)
Change-Id: I18dcf20e51e941ca8ccb47315ea453399ca0d88a
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 04dce61..927a86a 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -115,7 +115,7 @@ String RID_STR_QUERIES_HELP_TEXT
String RID_STR_QUERIES_HELP_TEXT_SQL
{
-Text [ en-US ] = "Create a query entering an SQL statement directly." ;
+Text [ en-US ] = "Create a query by entering an SQL statement directly." ;
};
String RID_STR_QUERIES_HELP_TEXT_WIZARD
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - connectivity/source
connectivity/source/drivers/flat/ETable.cxx | 26 +++---
connectivity/source/inc/flat/ETable.hxx |1 +
2 files changed, 16 insertions(+), 11 deletions(-)
New commits:
commit 50c64dc7b89da8f40c71e2ff6d3697a9b6b55442
Author: Damjan Jovanovic
Date: Sun Apr 3 15:02:59 2016 +
#i122754# Base does not properly parse CSV files as per RFC-4180 (while
Calc does)
The flat file driver, in file
main/connectivity/source/drivers/flat/ETable.cxx, method
OFlatTable::fillColumns(), which reads lines to initialize columns,
assumes fields in the header and the first few lines never continue onto
the next line(s). This causes truncation of columns when they do.
Read all lines using the readLine() method instead of
SvStream::ReadByteStringLine(), which takes overflow onto next lines into
account. Also implement a new version of readLine() which allows reading
into an arbitrary string, as opposed to m_aCurrentLine only.
Patch by: me
diff --git a/connectivity/source/drivers/flat/ETable.cxx
b/connectivity/source/drivers/flat/ETable.cxx
index 47f5c52..1620b64 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -72,26 +72,26 @@ void OFlatTable::fillColumns(const
::com::sun::star::lang::Locale& _aLocale)
QuotedTokenizedString aHeaderLine;
OFlatConnection* pConnection = (OFlatConnection*)m_pConnection;
-const rtl_TextEncoding nEncoding = m_pConnection->getTextEncoding();
const sal_Bool bHasHeaderLine = pConnection->isHeaderLine();
+sal_Int32 nCurPos;
if ( bHasHeaderLine )
{
while(bRead && !aHeaderLine.Len())
{
-bRead = m_pFileStream->ReadByteStringLine(aHeaderLine,nEncoding);
+bRead = readLine(aHeaderLine, nCurPos);
}
m_nStartRowFilePos = m_pFileStream->Tell();
}
// read first row
QuotedTokenizedString aFirstLine;
-bRead = m_pFileStream->ReadByteStringLine(aFirstLine,nEncoding);
+bRead = readLine(aFirstLine, nCurPos);
if ( !bHasHeaderLine || !aHeaderLine.Len())
{
while(bRead && !aFirstLine.Len())
{
-bRead = m_pFileStream->ReadByteStringLine(aFirstLine,nEncoding);
+bRead = readLine(aFirstLine, nCurPos);
}
// use first row as headerline because we need the number of columns
aHeaderLine = aFirstLine;
@@ -155,7 +155,7 @@ void OFlatTable::fillColumns(const
::com::sun::star::lang::Locale& _aLocale)
}
++nRowCount;
}
-while(nRowCount < nMaxRowsToScan &&
m_pFileStream->ReadByteStringLine(aFirstLine,nEncoding) &&
!m_pFileStream->IsEof());
+while(nRowCount < nMaxRowsToScan && readLine(aFirstLine,nCurPos) &&
!m_pFileStream->IsEof());
for (xub_StrLen i = 0; i < nFieldCount; i++)
{
@@ -895,21 +895,26 @@ sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement
eCursorPosition, sal_Int
//
-
sal_Bool OFlatTable::readLine(sal_Int32& _rnCurrentPos)
{
+return readLine(m_aCurrentLine, _rnCurrentPos);
+}
+//
-
+sal_Bool OFlatTable::readLine(QuotedTokenizedString& line, sal_Int32&
_rnCurrentPos)
+{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "ocke.jans...@sun.com",
"OFlatTable::readLine" );
const rtl_TextEncoding nEncoding = m_pConnection->getTextEncoding();
-m_pFileStream->ReadByteStringLine(m_aCurrentLine,nEncoding);
+m_pFileStream->ReadByteStringLine(line,nEncoding);
if (m_pFileStream->IsEof())
return sal_False;
-QuotedTokenizedString sLine = m_aCurrentLine; // check if the string
continues on next line
+QuotedTokenizedString sLine = line; // check if the string continues on
next line
while( (sLine.GetString().GetTokenCount(m_cStringDelimiter) % 2) != 1 )
{
m_pFileStream->ReadByteStringLine(sLine,nEncoding);
if ( !m_pFileStream->IsEof() )
{
-m_aCurrentLine.GetString().Append('\n');
-m_aCurrentLine.GetString() += sLine.GetString();
-sLine = m_aCurrentLine;
+line.GetString().Append('\n');
+line.GetString() += sLine.GetString();
+sLine = line;
}
else
break;
@@ -917,4 +922,3 @@ sal_Bool OFlatTable::readLine(sal_Int32& _rnCurrentPos)
_rnCurrentPos = m_pFileStream->Tell();
return sal_True;
}
-
diff --git a/connectivity/source/inc/flat/ETable.hxx
b/connectivity/source/inc/flat/ETable.hxx
index 0042e2e..b9f2304 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -64,6 +
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/inc sc/prj sc/source sc/test
sc/inc/stringutil.hxx |3 +
sc/prj/build.lst |1
sc/source/core/tool/stringutil.cxx |6 ++-
sc/test/main.cxx | 30
sc/test/makefile.mk| 68 +
sc/test/stringutiltests.cxx| 40 +
6 files changed, 145 insertions(+), 3 deletions(-)
New commits:
commit 10458a24f4e6cc311e65fb80ce576fed39937be2
Author: Damjan Jovanovic
Date: Mon Apr 4 04:11:07 2016 +
#i126901# CSV import: values with + or - followed by thousand separator and
3 digits (eg. +,123) are imported as a number
Do not allow numbers parsed from CVS files when "Detect special numbers" is
off, to contain thousand separators before digits, even if after a +/- sign
(eg. -,123 or +,789). Treat these as strings instead.
Also added unit tests for this and exported the ScStringUtil class so it
can be tested.
Patch by: me
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index 1b06228..0094055 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -25,8 +25,9 @@
#define SC_STRINGUTIL_HXX
#include "rtl/ustring.hxx"
+#include "scdllapi.h"
-class ScStringUtil
+class SC_DLLPUBLIC ScStringUtil
{
public:
/**
diff --git a/sc/prj/build.lst b/sc/prj/build.lst
index e3a62f8..4d898ca 100644
--- a/sc/prj/build.lst
+++ b/sc/prj/build.lst
@@ -48,6 +48,7 @@ scsc\addin\datefunc
nmake - all sc_addfu sc_add sc_sdi sc_inc NULL
sc sc\addin\rot13 nmake -
all sc_adrot sc_add sc_sdi sc_inc NULL
sc sc\addin\util nmake -
all sc_adutil sc_addfu sc_adrot sc_sdi sc_inc NULL
sc sc\util nmake -
all sc_util sc_addfu sc_adrot sc_adutil sc_app sc_attr sc_cctrl sc_cosrc
sc_data sc_dbgui sc_dif sc_docsh sc_drfnc sc_excel sc_form sc_html sc_lotus
sc_qpro sc_misc sc_name sc_nvipi sc_opt sc_page sc_rtf sc_scalc sc_style
sc_tool sc_uisrc sc_sidebar sc_undo sc_unobj sc_view sc_xcl97 sc_xml sc_acc
sc_ftools sc_inc sc_vba NULL
+sc sc\test nmake -
all sc_test sc_util NULL
# remarked due to the fact, key press is need in this test.
# sc sc\qa\complex\calcPreview nmake -
all qa_calcpreview NULL
diff --git a/sc/source/core/tool/stringutil.cxx
b/sc/source/core/tool/stringutil.cxx
index 539c34f..50fae6a 100644
--- a/sc/source/core/tool/stringutil.cxx
+++ b/sc/source/core/tool/stringutil.cxx
@@ -45,6 +45,7 @@ bool ScStringUtil::parseSimpleNumber(
const sal_Unicode* p = rStr.getStr();
sal_Int32 nPosDSep = -1, nPosGSep = -1;
sal_uInt32 nDigitCount = 0;
+bool haveSeenDigit = false;
for (sal_Int32 i = 0; i < n; ++i)
{
@@ -57,6 +58,7 @@ bool ScStringUtil::parseSimpleNumber(
{
// this is a digit.
aBuf.append(c);
+haveSeenDigit = true;
++nDigitCount;
}
else if (c == dsep)
@@ -81,8 +83,8 @@ bool ScStringUtil::parseSimpleNumber(
{
// this is a group (thousand) separator.
-if (i == 0)
-// not allowed as the first character.
+if (!haveSeenDigit)
+// not allowed before digits.
return false;
if (nPosDSep >= 0)
diff --git a/sc/test/main.cxx b/sc/test/main.cxx
new file mode 100644
index 000..0777abb
--- /dev/null
+++ b/sc/test/main.cxx
@@ -0,0 +1,30 @@
+/**
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "precompiled_sc.hxx"
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}
diff --git a/sc/test/makefile.mk b/sc/test/mak
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bridges/source
bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit d4fef0af14f41826a7ed4e09472ebac205c016a5 Author: Damjan Jovanovic Date: Thu Aug 13 16:23:54 2015 + Fix a compilation failure caused by missing include when debugging is enabled. diff --git a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx index c0f619f..331ea5d 100644 --- a/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source
dbaccess/source/core/api/RowSet.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7678e87b129c0fbdaa397b7c103aeefc8891ab5e Author: Damjan Jovanovic Date: Fri Aug 14 19:17:46 2015 + #i120706# CRASH - navigating tables containing NULL timestamps in DataSourceBrowser using mysql JDBC connector causes AOO to crash because the read-only column list was not kept in sync with the column list. diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 5b7e0a1..d65a4e9 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -565,6 +565,7 @@ void ORowSet::freeResources( bool _bComplete ) // the columns must be disposed before the querycomposer is disposed because // their owner can be the composer TDataColumns().swap(m_aDataColumns);// clear and resize capacity +m_aReadOnlyDataColumns.clear(); m_xColumns = NULL; if ( m_pColumns ) m_pColumns->disposing(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - javaunohelper/com ridljar/com xmerge/source
javaunohelper/com/sun/star/comp/helper/Bootstrap.java
| 12 ++
ridljar/com/sun/star/uno/IMethodDescription.java
|4 +--
ridljar/com/sun/star/uno/Type.java
|4 +--
ridljar/com/sun/star/uno/Union.java
|2 -
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/ExtendedFormat.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
|6 ++---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbDecoder.java
| 10
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
|4 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/TextNodeIterator.java
|2 -
12 files changed, 28 insertions(+), 24 deletions(-)
New commits:
commit 01aadc965ca97f28505418c6fb95a0c4c1f0d160
Author: Damjan Jovanovic
Date: Sun Aug 23 17:26:31 2015 +
Fix some of the many javadoc 8 errors.
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index eb9bf0c..66ae01f 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -97,6 +97,7 @@ public class Bootstrap {
@param context_entries the hash table contains mappings of entry names
(type string) to
context entries (type class ComponentContextEntry).
@return a new context.
+@throws java.lang.Exception
*/
static public XComponentContext createInitialComponentContext( Hashtable
context_entries )
throws Exception
@@ -149,6 +150,7 @@ public class Bootstrap {
*
* @return a freshly boostrapped service manager
* @seecom.sun.star.lang.ServiceManager
+ * @throws java.lang.Exception
*/
static public XMultiServiceFactory createSimpleServiceManager() throws
Exception
{
@@ -157,10 +159,12 @@ public class Bootstrap {
}
-/** Bootstraps the initial component context from a native UNO
installation.
-
-@see cppuhelper/defaultBootstrap_InitialComponentContext()
-*/
+/**
+ * Bootstraps the initial component context from a native UNO installation.
+ *
+ * @return
+ * @see cppuhelper/defaultBootstrap_InitialComponentContext()
+ */
static public final XComponentContext
defaultBootstrap_InitialComponentContext()
throws Exception
{
diff --git a/ridljar/com/sun/star/uno/IMethodDescription.java
b/ridljar/com/sun/star/uno/IMethodDescription.java
index f712556..0c1aad5 100644
--- a/ridljar/com/sun/star/uno/IMethodDescription.java
+++ b/ridljar/com/sun/star/uno/IMethodDescription.java
@@ -52,7 +52,7 @@ public interface IMethodDescription extends
IMemberDescription {
boolean isConst();
/**
- * Gives any array of ITypeDescription> of
+ * Gives any array of ITypeDescription of
* the [in] parameters.
*
* @return the in parameters
@@ -60,7 +60,7 @@ public interface IMethodDescription extends
IMemberDescription {
ITypeDescription[] getInSignature();
/**
- * Gives any array of ITypeDescription> of
+ * Gives any array of ITypeDescription of
* the [out] parameters.
*
* @return the out parameters
diff --git a/ridljar/com/sun/star/uno/Type.java
b/ridljar/com/sun/star/uno/Type.java
index f3a55f4..411db96 100644
--- a/ridljar/com/sun/star/uno/Type.java
+++ b/ridljar/com/sun/star/uno/Type.java
@@ -33,7 +33,7 @@ import java.util.HashMap;
* SHORT) do not have a matching Java class. For another, it can be
* necessary to describe a type which is unknown to the Java runtime system
* (for example, for delaying the need of a class, so that it is possible to
- * generate it on the fly.)
+ * generate it on the fly.)
*
* A Type is uniquely determined by its type class (a
* TypeClass) and its type name (a String); these two
@@ -204,7 +204,7 @@ public class Type {
*
* In certain cases, one Java class corresponds to two UNO types (e.g.,
* the Java class short[].class corresponds to both a sequence
- * of SHORT and a sequence of UNSIGNED SHORT in
+ * of SHORT and a sequence of UNSIGNED SHORT in
* UNO). In such ambiguous cases, the parameter alternative
* controls which UN
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - javaunohelper/com xmerge/source
/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
| 16 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/StyleCatalog.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/BookSettings.java
|3 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
|9 ++---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/DocumentMergerImpl.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
| 16 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/NameDefinition.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
|4 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java
|9 +
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SpreadsheetEncoder.java
| 10 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentMergerImpl.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorRowCompare.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/SheetUtil.java
|2 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
|4 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
|6 +--
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
| 14
59 files changed, 138 insertions(+), 178 deletions(-)
New commits:
commit 7fa859c4b25df3326ddda3e603c9833d194b701f
Author: Damjan Jovanovic
Date: Sun Aug 23 19:26:16 2015 +
More javadoc fixes for building with Java 8.
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index d5cf73a..5a387fb 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -467,6 +467,8 @@ public class InterfaceContainer implements Cloneable
/** The iterator keeps a copy of the list. Changes to InterfaceContainer
do not
* affect the data of the iterator. Conversly, changes to the iterator
are effect
* InterfaceContainer.
+ *
+ * @param index
*/
synchronized public ListIterator listIterator(int index)
{
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index 20e997b..f3e63be 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -122,7 +122,7 @@ XMultiPropertySet
* initialization of the inheriting class (i.e. within the contructor)
* @param name The property's name (Property.Name).
* @param handle The property's handle (Property.Handle).
- * @param Type The property's type (Property.Type).
+ * @param type The property's type (Property.Type).
* @param attributes The property's attributes (Property.Attributes).
* @param id Identifies the property's storage.
*/
@@ -140,8 +140,7 @@ XMultiPropertySet
* Registration has to occur during
* initialization of the inheriting class (i.e. within the contructor).
* @param name The property's name (Property.Name).
- * @param handle The property's handle (Property.Handle).
- * @param Type The property's type (Property.Type).
+ * @param type The property's type (Property.Type).
* @param attributes The property's attributes (Property.Attributes).
* @param id Identifies the property's storage.
*/
@@ -563,11 +562,11 @@ XMultiPropertySet
* {@link #setFastPropertyValue XFastPropertySet.setFastPropertyValue}
* and {@link #setPropertyValues XMultiPropertySet.setPropertyValues}.
* If this method fails, that is, it returns false or throws an
exception, then no listeners are notified and the
-
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmerge/source
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
|2 +-
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
|6 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
| 10 --
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
|3 +--
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
|6 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/dom/DOMDocument.java
|2 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnRowInfo.java
|5 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
|2 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
|4 ++--
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
|3 ---
10 files changed, 11 insertions(+), 32 deletions(-)
New commits:
commit b5b4892e2bb80e5c308cf63a3e4c1c4f639d88d0
Author: Damjan Jovanovic
Date: Sun Aug 23 20:37:20 2015 +
Fix bad @return javadocs in main/xmerge.
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
index 6e85b9f..8886823 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/LabelCell.java
@@ -126,7 +126,7 @@ public class LabelCell extends CellValue {
/**
* Sets the String representing the cells contents
*
- * @return the String representing the cells contents
+ * @param cellContents the String representing the cells
contents
*/
private void setLabel(String cellContents) throws IOException {
rgch = cellContents.getBytes("UTF-16LE");
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
index ff718c7..f355538 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Pane.java
@@ -120,9 +120,11 @@ public class Pane implements BIFFRecord {
}
/**
- * Get the hex code for this particular BIFFRecord
+ * Set the pane number of the active pane
+ * 0 - bottom right, 1 - top right
+ * 2 - bottom left, 3 - top left
*
- * @return the hex code for Pane
+ * @param paneNumber the pane number of the active pane
*/
public void setPaneNumber(int paneNumber) {
pnnAcct = (byte) paneNumber;
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
index 3db5794..70fea79f 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Selection.java
@@ -76,21 +76,11 @@ public class Selection implements BIFFRecord {
return PocketExcelConstants.CURRENT_SELECTION;
}
-/**
- * Get the hex code for this particular BIFFRecord
- *
- * @return the hex code for Selection
- */
public Point getActiveCell() {
Point p = new Point(colActive, EndianConverter.readShort(rwActive));
return p;
}
-/**
- * Get the hex code for this particular BIFFRecord
- *
- * @return the hex code for Selection
- */
public void setActiveCell(Point p) {
colActive = (byte) p.getX();
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
index 8f98297..8e4aac3 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Workbook.java
@@ -358,7 +358,7 @@ OfficeConstants {
/**
* Adds a Worksheet to the workbook.
*
- * @return name the name of the Worksheet to be added
+ * @param name the name of the Worksheet to be added
*/
public void addWorksheet(String name) throws IOException {
@@ -372,7 +372,6 @@ OfficeConstants {
/**
* Adds a cell to the current worksheet.
*
- * @return the n
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - xmerge/source
xmerge/source/bridge/java/XMergeBridge.java
|1
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
|2
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
|2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
| 29 --
4 files changed, 14 insertions(+), 20 deletions(-)
New commits:
commit af75d8d3f6defc9ae79e09fde3cee3a3c60e32df
Author: Damjan Jovanovic
Date: Mon Aug 24 03:07:26 2015 +
Fix all xmerge javadoc errors.
diff --git a/xmerge/source/bridge/java/XMergeBridge.java
b/xmerge/source/bridge/java/XMergeBridge.java
index 5317a24..4442301 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -92,7 +92,6 @@ public class XMergeBridge {
/** This inner class provides the component as a concrete implementation
* of the service description. It implements the needed interfaces.
- * @implements XTypeProvider
*/
static public class _XMergeBridge implements
XImportFilter,
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
index 2e10fbb..6981a22 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/FormulaHelper.java
@@ -33,7 +33,7 @@ import
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Workbook;
/**
* This Helper class provides a simplified interface to conversion between
PocketXL formula representation
* and Calc formula representation.
- * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.Formula}
+ * The class is used by {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.Formula}
*/
public class FormulaHelper {
diff --git
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
index 6aac8e6..cb7d42a 100644
---
a/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
+++
b/xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/formula/PrecedenceTable.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
/**
* This class defines the precedence applied to each operator when performing
a conversion
- * {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.Records.formula.FormulaCompiler.infix2
from infix to RPN.}.
+ * {@link
org.openoffice.xmerge.converter.xml.sxc.pexcel.records.formula.FormulaCompiler#infix2RPN
from infix to RPN.}.
*/
public class PrecedenceTable {
public static final int DEFAULT_PRECEDENCE = 0;
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 18c9ff1..4b03bbf 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -123,26 +123,21 @@ class alignment extends conversionAlgorithm {
/**
* This class represents a paragraph Style.
*
- *
- * AttributeValue
- *
- * MARGIN_LEFT mm * 100
- *
- * MARGIN_RIGHT mm * 100
- *
- * MARGIN_TOP mm * 100 (space on top of paragraph)
- *
- * MARGIN_BOTTOMmm * 100
- *
- * TEXT_INDENT mm * 100 (first line indent)
- *
- * LINE_HEIGHT mm * 100, unless or'ed with LH_PCT, in which
+ *
+ * Properties
+ * AttributeValue
+ * MARGIN_LEFT mm * 100
+ * MARGIN_RIGHT mm * 100
+ * MARGIN_TOP mm * 100 (space on top of
paragraph)
+ * MARGIN_BOTTOMmm * 100
+ * TEXT_INDENT mm * 100 (first line indent)
+ * LINE_HEIGHT mm * 100, unless or'ed with LH_PCT, in
which
* case it is a percentage (e.g. 200% for double spacing)
* Can also be or'ed with LH_ATLEAST. Value is stored
* in bits indicated by LH_VALUEMASK.
- *
- * TEXT_ALIGN ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST, ALIGN_LEFT
- *
+ *
+ * TEXT_ALIGN ALIGN_RIGHT, ALIGN_CENTER, ALIGN_JUST,
ALIGN_LEFT
+ *
*
* @author David Proulx
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - javaunohelper/com ridljar/com
javaunohelper/com/sun/star/comp/helper/Bootstrap.java |6 +-
javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java |2
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java | 28
+-
javaunohelper/com/sun/star/lib/uno/helper/Factory.java|3 -
ridljar/com/sun/star/uno/IEnvironment.java|2
ridljar/com/sun/star/uno/ITypeDescription.java| 18 +++---
6 files changed, 30 insertions(+), 29 deletions(-)
New commits:
commit df3a689140ef47a8b7e960769a0fa7f2e479e601
Author: Damjan Jovanovic
Date: Mon Aug 24 04:22:52 2015 +
Fix all remaining javadoc errors that break the build with Java 8.
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 66ae01f..638bded 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -149,7 +149,7 @@ public class Bootstrap {
* Bootstraps a servicemanager with the jurt base components registered.
*
* @return a freshly boostrapped service manager
- * @seecom.sun.star.lang.ServiceManager
+ * @see"com.sun.star.lang.ServiceManager"
* @throws java.lang.Exception
*/
static public XMultiServiceFactory createSimpleServiceManager() throws
Exception
@@ -163,7 +163,7 @@ public class Bootstrap {
* Bootstraps the initial component context from a native UNO installation.
*
* @return
- * @see cppuhelper/defaultBootstrap_InitialComponentContext()
+ * @see defaultBootstrap_InitialComponentContext()
*/
static public final XComponentContext
defaultBootstrap_InitialComponentContext()
throws Exception
@@ -177,7 +177,7 @@ public class Bootstrap {
@param bootstrap_parameters
bootstrap parameters (maybe null)
-@see cppuhelper/defaultBootstrap_InitialComponentContext()
+@see defaultBootstrap_InitialComponentContext()
*/
static public final XComponentContext
defaultBootstrap_InitialComponentContext(
String ini_file, Hashtable bootstrap_parameters )
diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
index 623402d..4d4cd2f 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
@@ -29,7 +29,7 @@ package com.sun.star.comp.helper;
The first one is commonly used for singleton objects of the component
context, that are raised on first-time retrieval of the key.
You have to pass a com.sun.star.lang.XSingleComponentFactory
-or string (=> service name) object for this.
+or string (=> service name) object for this.
*/
public class ComponentContextEntry
diff --git a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
index 9015724..8b107b9 100644
--- a/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
+++ b/javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
@@ -34,9 +34,9 @@ import com.sun.star.registry.XRegistryKey;
* The SharedLibraryLoader class provides the functionality of
the com.sun.star.loader.SharedLibrary
* service.
*
- * @see com.sun.star.loader.SharedLibrary
+ * @see "com.sun.star.loader.SharedLibrary"
* @see com.sun.star.comp.servicemanager.ServiceManager
- * @see com.sun.star.lang.ServiceManager
+ * @see "com.sun.star.lang.ServiceManager"
*/
public class SharedLibraryLoader {
/**
@@ -70,9 +70,9 @@ public class SharedLibraryLoader {
* @return the factory for the
"com.sun.star.comp.stoc.DLLComponentLoader" component.
* @param smgrthe ServiceManager
* @param regKey the root registry key
- * @see com.sun.star.loader.SharedLibrary
- * @see com.sun.star.lang.ServiceManager
- * @see com.sun.star.registry.RegistryKey
+ * @see "com.sun.star.loader.SharedLibrary"
+ * @see "com.sun.star.lang.ServiceManager"
+ * @see "com.sun.star.registry.RegistryKey"
*/
public static XSingleServiceFactory getServiceFactory(
XMultiServiceFactory smgr,
@@ -93,9 +93,9 @@ public class SharedLibraryLoader {
* @param impName the implementation name of the component
* @param smgrthe ServiceManager
* @param regKey the root registry key
- * @see com.sun.star.loader.SharedLibrary
- * @see com.sun.star.lang.ServiceManager
- * @see com.sun.star.registry.RegistryKey
+ * @see "com.sun.star.loader.SharedLibrary"
+ * @see "com.sun.star.lang.Servi
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basegfx/test
basegfx/test/basegfx2d.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c040a9c430a21c074b0d31ae91a9ff579537c40e
Author: Damjan Jovanovic
Date: Mon Aug 24 17:51:36 2015 +
Fix a mistyped comma in a basegfx test commited in 1536730.
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index b317d7b..73a3ba3 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -193,7 +193,7 @@ public:
CPPUNIT_ASSERT_MESSAGE("importing simple bezier polygon from SVG-D",
tools::importFromSvgD( aReImport, aExport, false, 0));
CPPUNIT_ASSERT_MESSAGE("re-imported polygon needs to be identical",
aReImport == aPoly);
-CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D",
tools::importFromSvgD( aPoly, aPath2, , false, 0));
+CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D",
tools::importFromSvgD( aPoly, aPath2, false, 0));
aExport = tools::exportToSvgD( aPoly, true, true, false );
// Adaptions for B2DPolygon bezier change (see #i77162#):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basegfx/test
basegfx/test/boxclipper.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 7b40f37a5a85526fb5651e8ab4fdff0b8e9e61d3 Author: Damjan Jovanovic Date: Mon Aug 24 18:10:58 2015 + Fix further basegfx test build errors. diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index 38fd51d..6672dc8 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -246,7 +246,7 @@ public: aTmp1, rtl::OUString::createFromAscii(sSvg), false, 0)); const rtl::OUString aSvg= -tools::exportToSvgD(toTest.solveCrossovers(), , true, true, false); +tools::exportToSvgD(toTest.solveCrossovers(), true, true, false); B2DPolyPolygon aTmp2; CPPUNIT_ASSERT_MESSAGE(sName, tools::importFromSvgD( @@ -301,7 +301,7 @@ public: #if defined(VERBOSE) fprintf(stderr, "%s - svg:d=\"%s\"\n", pName, rtl::OUStringToOString( -basegfx::tools::exportToSvgD(rPoly, , true, true, false), +basegfx::tools::exportToSvgD(rPoly, true, true, false), RTL_TEXTENCODING_UTF8).getStr() ); #endif } @@ -345,14 +345,14 @@ public: fprintf(stderr, "%s input - svg:d=\"%s\"\n", pName, rtl::OUStringToOString( basegfx::tools::exportToSvgD( -genericClip, , true, true, false), +genericClip, true, true, false), RTL_TEXTENCODING_UTF8).getStr() ); #endif const B2DPolyPolygon boxClipResult=rRange.solveCrossovers(); const rtl::OUString boxClipSvg( basegfx::tools::exportToSvgD( -normalizePoly(boxClipResult)), true, true, false); +normalizePoly(boxClipResult), true, true, false)); #if defined(VERBOSE) fprintf(stderr, "%s boxclipper - svg:d=\"%s\"\n", pName, rtl::OUStringToOString( @@ -363,7 +363,7 @@ public: genericClip = tools::solveCrossovers(genericClip); const rtl::OUString genericClipSvg( basegfx::tools::exportToSvgD( -normalizePoly(genericClip)), true, true, false); +normalizePoly(genericClip), true, true, false)); #if defined(VERBOSE) fprintf(stderr, "%s genclipper - svg:d=\"%s\"\n", pName, rtl::OUStringToOString( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source
basic/source/runtime/methods.cxx | 18 ++
1 file changed, 2 insertions(+), 16 deletions(-)
New commits:
commit a68493266e9212119f31e58c256f00fb9bcc8d20
Author: Damjan Jovanovic
Date: Wed Aug 26 02:10:46 2015 +
#i117989# Basic functions Day(), Hour(), Minute(), and Second() return
wrong results for dates <1900-1-1
Also extended our spreadsheeet test to search through more columns, open
spreadsheets
with macros enabled, and added a test for the the Year(), Month(), Day(),
Hour(),
Minute(), and Second() functions comparing Calc's formulas vs StarBasic's
runtime functions.
Found-by: villeroy
Patch-by: Damjan Jovanovic
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 88e1aca..6d5b036 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1789,17 +1789,9 @@ RTLFUNC(Val)
sal_Int16 implGetDateDay( double aDate )
{
aDate -= 2.0; // normieren: 1.1.1900 => 0.0
+aDate = floor( aDate );
Date aRefDate( 1, 1, 1900 );
-if ( aDate >= 0.0 )
-{
-aDate = floor( aDate );
-aRefDate += (sal_uIntPtr)aDate;
-}
-else
-{
-aDate = ceil( aDate );
-aRefDate -= (sal_uIntPtr)(-1.0 * aDate);
-}
+aRefDate += (sal_uIntPtr)aDate;
sal_Int16 nRet = (sal_Int16)( aRefDate.GetDay() );
return nRet;
@@ -2110,8 +2102,6 @@ RTLFUNC(Year)
sal_Int16 implGetHour( double dDate )
{
-if( dDate < 0.0 )
-dDate *= -1.0;
double nFrac = dDate - floor( dDate );
nFrac *= 86400.0;
sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
@@ -2136,8 +2126,6 @@ RTLFUNC(Hour)
sal_Int16 implGetMinute( double dDate )
{
-if( dDate < 0.0 )
-dDate *= -1.0;
double nFrac = dDate - floor( dDate );
nFrac *= 86400.0;
sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
@@ -2177,8 +2165,6 @@ RTLFUNC(Month)
sal_Int16 implGetSecond( double dDate )
{
-if( dDate < 0.0 )
-dDate *= -1.0;
double nFrac = dDate - floor( dDate );
nFrac *= 86400.0;
sal_Int32 nSeconds = (sal_Int32)(nFrac + 0.5);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source
basic/source/sbx/sbxscan.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 175afdcb151d9ce1238dc9fec59f2dfc2eb07345
Author: Damjan Jovanovic
Date: Wed Aug 26 18:10:02 2015 +
#i112383# CLng("&H") fails on 64-bits rather than returning -1
Found-by: andrew
Patch-by: Damjan Jovanovic
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 910e61a..0cf4b7d 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -202,7 +202,7 @@ SbxError ImpScan( const ::rtl::OUString& rWSrc, double&
nVal, SbxDataType& rType
case 'H': break;
default : bRes = sal_False;
}
-long l = 0;
+sal_Int32 l = 0;
int i;
while( isalnum( *p ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - codemaker/prj codemaker/test
codemaker/prj/build.lst |3
codemaker/test/cppumaker/makefile.mk | 29 +--
codemaker/test/cppumaker/test_codemaker_cppumaker.cxx | 143 --
codemaker/test/javamaker/makefile.mk |4
4 files changed, 86 insertions(+), 93 deletions(-)
New commits:
commit ad2b967a33956c83cb081c1de3af81dea3eb9150
Author: Damjan Jovanovic
Date: Thu Aug 27 18:44:50 2015 +
#i125003# migrate main/codemaker from cppunit to Google Test.
Run the cppumaker test on every build.
Also some updates to the javamaker test (which doesn't work yet; JUnit
version problem?).
diff --git a/codemaker/prj/build.lst b/codemaker/prj/build.lst
index e0520d5..3d01fc4 100644
--- a/codemaker/prj/build.lst
+++ b/codemaker/prj/build.lst
@@ -7,5 +7,4 @@ cm codemaker\source\commoncpp
nmake - all cm_cpp cm_inc NULL
cm codemaker\source\cppumaker nmake -
all cm_cppumakercm_codemaker cm_cpp cm_inc NULL
cm codemaker\source\commonjava nmake -
all cm_java cm_inc NULL
cm codemaker\source\javamaker nmake -
all cm_javamaker cm_codemaker cm_java cm_inc NULL
-
-
+cm codemaker\test\cppumakernmake -
all cm_cppumaker_test cm_cppumaker cm_codemaker cm_cpp cm_inc NULL
diff --git a/codemaker/test/cppumaker/makefile.mk
b/codemaker/test/cppumaker/makefile.mk
index 32cf3f0..de48805 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -29,26 +29,27 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
-DLLPRE = # no leading "lib" on .so files
+.ELSE
INCPRE += $(MISC)$/$(TARGET)$/inc
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_codemaker_cppumaker.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
+APP1TARGET = $(TARGET)
+APP1OBJS = $(SLO)$/test_codemaker_cppumaker.obj
+APP1STDLIBS = $(CPPULIB) $(GTESTLIB) $(SALLIB) $(TESTSHL2LIB)
+APP1VERSIONMAP = version.map
+APP1IMPLIB = i$(APP1TARGET)
+DEF1NAME = $(APP1TARGET)
+APP1TEST = enabled
-SLOFILES = $(SHL1OBJS)
+SLOFILES = $(APP1OBJS)
.INCLUDE: target.mk
-ALLTAR: test
-
-$(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
+$(APP1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
$(MISC)$/$(TARGET).cppumaker.flag: $(BIN)$/cppumaker$(EXECPOST)
$(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
@@ -65,5 +66,5 @@ $(MISC)$/$(TARGET)$/types.urd: types.idl
- $(MKDIR) $(MISC)$/$(TARGET)
$(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
-test .PHONY: $(SHL1TARGETN)
-$(AUGMENT_LIBRARY_PATH) testshl2 $<
+
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
index f299b6b..ca4183e 100644
--- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
+++ b/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx
@@ -362,32 +362,17 @@
#include "com/sun/star/uno/Any.hxx"
#include "com/sun/star/uno/Type.hxx"
#include "com/sun/star/uno/TypeClass.hpp"
-#include "testshl/simpleheader.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
+#include "gtest/gtest.h"
#include
#include
-namespace {
-
-class Test: public CppUnit::TestFixture {
-public:
-void testBigStruct();
-
-void testPolyStruct();
+// FIXME:
+#define RUN_OLD_FAILING_TESTS 0
-void testExceptions();
-
-void testConstants();
-
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testBigStruct);
-CPPUNIT_TEST(testPolyStruct);
-CPPUNIT_TEST(testExceptions);
-CPPUNIT_TEST(testConstants);
-CPPUNIT_TEST_SUITE_END();
-};
+namespace {
struct Guard {
explicit Guard(void * buffer):
@@ -398,7 +383,7 @@ struct Guard {
test::codemaker::cppumaker::BigStruct * const p;
};
-void Test::testBigStruct() {
+TEST(Test, testBigStruct) {
// Default-initialize a BigStruct instance on top of a memory buffer filled
// with random data, and make sure that all members are
default-initialized:
boost::scoped_array< char > buffer(
@@ -409,36 +394,36 @@ void Test::testBigStruct() {
buffer[i] = '\x56';
}
Guard guard(buffer.get());
-CPPUNIT_ASSERT_EQUAL(guard.p->m1, sal_False);
-CPPUNIT_ASSERT_EQUAL(guard.p->m2, static_cast< sal_Int8 >(0));
-CPPUNIT_ASSERT_EQUAL(guard.p->m3, static_cast< sal_Int16 >(0));
-CPPUNIT_ASSERT_EQUAL(guard.p->m4, static_cast< sal_uInt16 >(0));
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - basegfx/test
basegfx/test/basegfx1d.cxx | 30
basegfx/test/basegfx2d.cxx | 1558
basegfx/test/basegfx3d.cxx | 138 ---
basegfx/test/basegfxtools.cxx | 61 -
basegfx/test/boxclipper.cxx | 202 ++---
basegfx/test/clipstate.cxx | 95 +-
basegfx/test/export.map | 30
basegfx/test/genericclipper.cxx | 78 --
basegfx/test/main.cxx | 28
basegfx/test/makefile.mk| 30
10 files changed, 898 insertions(+), 1352 deletions(-)
New commits:
commit f6bc2f21fee72a8b9c178ddd431ca3f05594f5e3
Author: Damjan Jovanovic
Date: Fri Aug 28 04:03:15 2015 +
No need for version map file with Google Test.
diff --git a/basegfx/test/export.map b/basegfx/test/export.map
deleted file mode 100644
index ec49c45..000
--- a/basegfx/test/export.map
+++ /dev/null
@@ -1,30 +0,0 @@
-#**
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**
-
-
-
-UDK_3_0_0 {
-global:
-cppunitTestPlugIn;
-
-local:
-*;
-};
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index 4d24efd..f85d14a 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -64,7 +64,6 @@ APP1STDLIBS= \
APP1IMPLIB= i$(APP1TARGET)
APP1RPATH = NONE
DEF1NAME=$(APP1TARGET)
-APP1VERSIONMAP = export.map
APP1TEST = enabled
# END --
commit 6f473b19e436d6e0f9e212c5913c347c4e0efdb0
Author: Damjan Jovanovic
Date: Fri Aug 28 03:58:57 2015 +
#i125003# migrate main/basegfx from cppunit to Google Test.
diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index 01c8a75..fcec8cc 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.cxx
@@ -27,45 +27,23 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include "gtest/gtest.h"
#include "postextstl.h"
namespace basegfx1d
{
-class b1drange : public CppUnit::TestFixture
+class b1drange : public ::testing::Test
{
public:
// initialise your test code values here.
-void setUp()
+virtual void SetUp()
{
}
-void tearDown()
+virtual void TearDown()
{
}
-
-// insert your test code here.
-// this is only demonstration code
-void EmptyMethod()
-{
- // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-}
-
-// Change the following lines only, if you add, remove or rename
-// member functions of the current class,
-// because these macros are need by auto register mechanism.
-
-CPPUNIT_TEST_SUITE(b1drange);
-CPPUNIT_TEST(EmptyMethod);
-CPPUNIT_TEST_SUITE_END();
}; // class b1drange
-//
-
-CPPUNIT_TEST_SUITE_REGISTRATION(basegfx1d::b1drange);
} // namespace basegfx1d
-
-CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 73a3ba3..f99ede4 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -27,9 +27,7 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
+#include "gtest/gtest.h"
#include "postextstl.h"
#include
@@ -56,9 +54,9 @@ using namespace ::basegfx;
namespace basegfx2d
{
-class b2dsvgdimpex : public CppUnit::TestFixture
+class b2dsvgdimpex : public ::testing::Test
{
-private:
+protected:
::rtl::OUString aPath0;
::rtl::OUString aPath1;
::rtl::OUString aPath2;
@@ -66,7 +64,7 @@ private:
public:
// initialise your test code values here.
-void setUp()
+virtual void SetUp()
{
// simple rectangle
aPath0 = ::rtl::OUString::createFromAs
[Libreoffice-commits] core.git: basic/source
basic/source/sbx/sbxscan.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9e318c09778f0416143f211c5817536d5f1db3b7
Author: Damjan Jovanovic
Date: Wed Aug 26 18:10:02 2015 +
Resolves: #i112383# CLng("&H") fails on 64-bits...
rather than returning -1
Found-by: andrew
Patch-by: Damjan Jovanovic
(cherry picked from commit 175afdcb151d9ce1238dc9fec59f2dfc2eb07345)
Change-Id: I996bbfa82b10716318944f390ea53e0a5ae7c89c
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 329d4c2..2d8daf7 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -236,7 +236,7 @@ SbxError ImpScan( const OUString& rWSrc, double& nVal,
SbxDataType& rType,
p++;
}
OUString aBufStr( aBuf.makeStringAndClear());
-long l = 0;
+sal_Int32 l = 0;
for( const sal_Unicode* q = aBufStr.getStr(); bRes && *q; q++ )
{
int i = *q - '0';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basebmp/test
basebmp/test/basictest.cxx | 396 ++-
basebmp/test/bmpmasktest.cxx | 58 +-
basebmp/test/bmptest.cxx | 71 ++-
basebmp/test/cliptest.cxx| 133 +-
basebmp/test/export.map | 30 ---
basebmp/test/filltest.cxx| 128 -
basebmp/test/linetest.cxx| 152 +---
basebmp/test/main.cxx| 28 +++
basebmp/test/makefile.mk | 33 +--
basebmp/test/masktest.cxx| 58 +-
basebmp/test/polytest.cxx| 133 +-
11 files changed, 470 insertions(+), 750 deletions(-)
New commits:
commit 05c9f765b76b0da85d4425ce40dc629a45f4f8d9
Author: Damjan Jovanovic
Date: Sat Aug 29 07:37:28 2015 +
#i125003# migrate main/basebmp from cppunit to Google Test.
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 7e242ad..85d4aaa 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -24,10 +24,7 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include "gtest/gtest.h"
#include "postextstl.h"
#include
@@ -51,248 +48,195 @@ namespace
debugDump( mpDevice32bpp, output );
*/
-class BasicTest : public CppUnit::TestFixture
+class BasicTest : public ::testing::Test
{
public:
-void colorTest()
+};
+
+TEST_F(BasicTest, colorTest)
+{
+Color aTestColor;
+
+aTestColor = Color(0xDEADBEEF);
+ASSERT_TRUE( aTestColor.toInt32() == 0xDEADBEEF ) << "unary constructor";
+
+aTestColor = Color( 0x10, 0x20, 0xFF );
+ASSERT_TRUE( aTestColor.toInt32() == 0x001020FF ) << "ternary constructor";
+
+aTestColor.setRed( 0x0F );
+ASSERT_TRUE( aTestColor.toInt32() == 0x00F20FF ) << "setRed()";
+
+aTestColor.setGreen( 0x0F );
+ASSERT_TRUE( aTestColor.toInt32() == 0x00F0FFF ) << "setGreen()";
+
+aTestColor.setBlue( 0x10 );
+ASSERT_TRUE( aTestColor.toInt32() == 0x00F0F10 ) << "setBlue()";
+
+aTestColor.setGrey( 0x13 );
+ASSERT_TRUE( aTestColor.toInt32() == 0x00131313 ) << "setGrey()";
+
+aTestColor = Color( 0x10, 0x20, 0xFF );
+ASSERT_TRUE( aTestColor.getRed() == 0x10 ) << "getRed()";
+ASSERT_TRUE( aTestColor.getGreen() == 0x20 ) << "getGreen()";
+ASSERT_TRUE( aTestColor.getBlue() == 0xFF ) << "getBlue()";
+}
+
+TEST_F(BasicTest, testConstruction)
+{
+const basegfx::B2ISize aSize(101,101);
+basegfx::B2ISize aSize2(aSize);
+BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize,
+ true,
+ Format::ONE_BIT_MSB_PAL
));
+ASSERT_TRUE( pDevice->getSize() == aSize2 ) << "right size";
+ASSERT_TRUE( pDevice->isTopDown() == true ) << "Top down format";
+ASSERT_TRUE( pDevice->getScanlineFormat() == Format::ONE_BIT_MSB_PAL ) <<
"Scanline format";
+ASSERT_TRUE( pDevice->getScanlineStride() == (aSize2.getY() + 7)/8 ) <<
"Scanline len";
+ASSERT_TRUE( pDevice->getPalette() ) << "Palette existence";
+ASSERT_TRUE( (*pDevice->getPalette())[0] == Color(0) ) << "Palette entry 0
is black";
+ASSERT_TRUE( (*pDevice->getPalette())[1] == Color(0x) ) <<
"Palette entry 1 is white";
+}
+
+TEST_F(BasicTest, testPixelFuncs)
+{
+// 1bpp
+const basegfx::B2ISize aSize(64,64);
+BitmapDeviceSharedPtr pDevice( createBitmapDevice( aSize,
+ true,
+ Format::ONE_BIT_MSB_PAL
));
+
+const basegfx::B2IPoint aPt(3,3);
+const Color aCol(0x);
+pDevice->setPixel( aPt, aCol, DrawMode_PAINT );
+ASSERT_TRUE(pDevice->getPixel(aPt) == aCol) << "get/setPixel roundtrip #1";
+
+const basegfx::B2IPoint aPt2(0,0);
+const Color aCol2(0x);
+pDevice->setPixel( aPt2, aCol2, DrawMode_PAINT );
+ASSERT_TRUE(pDevice->getPixel(aPt2) == aCol2) << "get/setPixel roundtrip
#2";
+
+const basegfx::B2IPoint aPt3(aSize.getX()-1,aSize.getY()-1);
+const Color aCol3(0x);
+pDevice->setPixel( aPt3, aCol3, DrawMode_PAINT );
+ASSERT_TRUE(pDevice->getPixel(aPt3) == aCol3) << "get/setPixel roundtrip
#3";
+
+pDevice->setPixel( aPt3, aCol2, DrawMode_PAINT );
+ASSERT_TRUE(pDevice->getPixel(aPt3) == aCol2) << "get/setPixel roundtrip
#3.5";
+
+const basegfx::B2IPoint aPt4(-10,-10);
+pDevice->setPixe
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basebmp/test basegfx/test codemaker/test
basebmp/test/makefile.mk |3 --- basegfx/test/makefile.mk |6 -- codemaker/test/cppumaker/makefile.mk |5 - 3 files changed, 14 deletions(-) New commits: commit 04f4d5281028a167c57d25ceb50696368f6e5ba7 Author: Damjan Jovanovic Date: Sat Aug 29 09:04:40 2015 + $(SLOFILES) is unnecessary for applications, and other makefiles simplifications for recently ported tests. diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index c951586..5b04090 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -108,9 +108,6 @@ APP1TEST = enabled #APP2DEF= $(MISC)$/$(TARGET).def #.ENDIF -#--- All object files --- -# do this here, so we get right dependencies -SLOFILES=$(APP1OBJS) # --- Targets -- diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk index f85d14a..c0c714c 100644 --- a/basegfx/test/makefile.mk +++ b/basegfx/test/makefile.mk @@ -61,17 +61,11 @@ APP1STDLIBS= \ $(CPPULIB) \ $(GTESTLIB) -APP1IMPLIB= i$(APP1TARGET) APP1RPATH = NONE -DEF1NAME=$(APP1TARGET) APP1TEST = enabled # END -- -#--- All object files --- -# do this here, so we get right dependencies -SLOFILES=$(APP1OBJS) - # --- Targets -- .ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES" diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk index de48805..d2aabf6 100644 --- a/codemaker/test/cppumaker/makefile.mk +++ b/codemaker/test/cppumaker/makefile.mk @@ -40,13 +40,8 @@ INCPRE += $(MISC)$/$(TARGET)$/inc APP1TARGET = $(TARGET) APP1OBJS = $(SLO)$/test_codemaker_cppumaker.obj APP1STDLIBS = $(CPPULIB) $(GTESTLIB) $(SALLIB) $(TESTSHL2LIB) -APP1VERSIONMAP = version.map -APP1IMPLIB = i$(APP1TARGET) -DEF1NAME = $(APP1TARGET) APP1TEST = enabled -SLOFILES = $(APP1OBJS) - .INCLUDE: target.mk $(APP1OBJS): $(MISC)$/$(TARGET).cppumaker.flag ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - binaryurp/qa solenv/inc
binaryurp/qa/main.cxx | 28 +++
binaryurp/qa/makefile.mk| 52
binaryurp/qa/test-cache.cxx | 21 ++-
binaryurp/qa/test-unmarshal.cxx | 28 +++
solenv/inc/_tg_app.mk | 73
5 files changed, 129 insertions(+), 73 deletions(-)
New commits:
commit 893e16df7748581fac11b389fc57acf53b464416
Author: Damjan Jovanovic
Date: Sat Aug 29 14:29:12 2015 +
#i125003# migrate main/binaryurp from cppunit to Google Test.
diff --git a/binaryurp/qa/main.cxx b/binaryurp/qa/main.cxx
new file mode 100644
index 000..df14e5b
--- /dev/null
+++ b/binaryurp/qa/main.cxx
@@ -0,0 +1,28 @@
+/**
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}
diff --git a/binaryurp/qa/makefile.mk b/binaryurp/qa/makefile.mk
index 8ab0683..ecf0968 100644
--- a/binaryurp/qa/makefile.mk
+++ b/binaryurp/qa/makefile.mk
@@ -29,39 +29,21 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
-.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
@all:
-.IF "$(GUI)" == "OS2"
-@echo "Skipping, cppunit broken."
-.ELIF "$(WITH_CPPUNIT)" != "YES"
-@echo "cppunit disabled. nothing do do."
-.END
+@echo unit tests are disabled. Nothing to do.
.ELSE
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE =
+APP1OBJS = $(SLO)/test-cache.obj $(SLO)/main.obj
+APP1RPATH = NONE
+APP1STDLIBS = $(GTESTLIB) $(SALLIB)
+APP1TARGET = test-cache
+APP1TEST = enabled
-.IF "$(GUI)" != "OS2"
-SLOFILES = $(SLO)/test-cache.obj $(SLO)/test-unmarshal.obj
-.ENDIF
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLO)/test-cache.obj
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB)
-.IF "$(GUI)" != "OS2"
-SHL1TARGET = test-cache
-.ELSE
-SHL1TARGET = test-c
-.ENDIF
-SHL1VERSIONMAP = version.map
-DEF1NAME = $(SHL1TARGET)
-
-SHL2IMPLIB = i$(SHL2TARGET)
-SHL2OBJS = \
+APP2OBJS = \
$(SLO)/test-unmarshal.obj \
$(SLO)/binaryany.obj \
$(SLO)/bridge.obj \
@@ -69,29 +51,27 @@ SHL2OBJS = \
$(SLO)/currentcontext.obj \
$(SLO)/incomingrequest.obj \
$(SLO)/lessoperators.obj \
+$(SLO)/main.obj \
$(SLO)/marshal.obj \
$(SLO)/outgoingrequests.obj \
$(SLO)/proxy.obj \
$(SLO)/reader.obj \
$(SLO)/unmarshal.obj \
$(SLO)/writer.obj
-SHL2RPATH = NONE
-SHL2STDLIBS = \
+APP2RPATH = NONE
+APP2STDLIBS = \
$(CPPUHELPERLIB) \
$(CPPULIB) \
-$(CPPUNITLIB) \
+$(GTESTLIB) \
$(SALHELPERLIB) \
$(SALLIB)
.IF "$(GUI)" != "OS2"
-SHL2TARGET = test-unmarshal
+APP2TARGET = test-unmarshal
.ELSE
-SHL2TARGET = test-u
+APP2TARGET = test-u
.ENDIF
-SHL2VERSIONMAP = version.map
-DEF2NAME = $(SHL2TARGET)
-
-.ENDIF # "$(GUI)" == "OS2"
+APP2TEST = enabled
.INCLUDE: target.mk
-.INCLUDE: _cppunit.mk
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/binaryurp/qa/test-cache.cxx b/binaryurp/qa/test-cache.cxx
index 2caa6ea..4352863 100644
--- a/binaryurp/qa/test-cache.cxx
+++ b/binaryurp/qa/test-cache.cxx
@@ -23,26 +23,18 @@
#include "sal/config.h"
-#include "cppunit/TestAssert.h"
-#include "cppunit/TestFixture.h"
-#include "cppunit/extensions/HelperMacros.h"
-#include "cppunit/plugin/TestPlugIn.h"
+#include "gtest/gtest.h"
#include "../source/cache.hxx"
namespace {
-class Test: public CppUnit::TestFixture {
-private:
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testNothingLostFromLruList);
-CPPUNIT_TEST_SUITE_END();
-
-void testNothingLostFromLruList();
+class Test: public ::testing::Test {
+public:
};
// cf. jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java:
-vo
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - cppuhelper/prj cppuhelper/qa
cppuhelper/prj/build.lst |2
cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx | 245 +++-
cppuhelper/qa/ifcontainer/export.map | 27
cppuhelper/qa/ifcontainer/main.cxx | 28
cppuhelper/qa/ifcontainer/makefile.mk | 24
cppuhelper/qa/unourl/cppu_unourl.cxx | 757 -
cppuhelper/qa/unourl/export.map| 27
cppuhelper/qa/unourl/makefile.mk | 24
cppuhelper/qa/weak/main.cxx| 28
cppuhelper/qa/weak/makefile.mk | 28
cppuhelper/qa/weak/test_weak.cxx | 20
11 files changed, 582 insertions(+), 628 deletions(-)
New commits:
commit 0bac131e4d3c36b2e6369877843a95c54e892ef5
Author: Damjan Jovanovic
Date: Sat Aug 29 19:25:11 2015 +
#i125003# migrate main/cppuhelper/qa/ifcontainer from cppunit to Google
Test,
but don't run it on every build as an assertion outside the test fails
during the test.
diff --git a/cppuhelper/qa/weak/main.cxx b/cppuhelper/qa/weak/main.cxx
new file mode 100644
index 000..df14e5b
--- /dev/null
+++ b/cppuhelper/qa/weak/main.cxx
@@ -0,0 +1,28 @@
+/**
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}
diff --git a/cppuhelper/qa/weak/makefile.mk b/cppuhelper/qa/weak/makefile.mk
index 705e7fb..edffe20 100644
--- a/cppuhelper/qa/weak/makefile.mk
+++ b/cppuhelper/qa/weak/makefile.mk
@@ -29,21 +29,19 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-DLLPRE = # no leading "lib" on .so files
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_weak.obj
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
$(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
+APP1TARGET = $(TARGET)
+APP1OBJS = $(SLO)$/test_weak.obj \
+ $(SLO)$/main.obj
+APP1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(GTESTLIB) $(SALLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
.INCLUDE: target.mk
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-$(TESTSHL2) $(SHL1TARGETN)
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/cppuhelper/qa/weak/test_weak.cxx b/cppuhelper/qa/weak/test_weak.cxx
index d935d6c..e85af65 100644
--- a/cppuhelper/qa/weak/test_weak.cxx
+++ b/cppuhelper/qa/weak/test_weak.cxx
@@ -34,9 +34,9 @@
#include "com/sun/star/uno/XWeak.hpp"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/weak.hxx"
-#include "testshl/simpleheader.hxx"
#include "rtl/ref.hxx"
#include "sal/types.h"
+#include "gtest/gtest.h"
namespace {
@@ -74,16 +74,11 @@ protected:
}
};
-class Test: public ::CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
-void testReferenceDispose();
-
-CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testReferenceDispose);
-CPPUNIT_TEST_SUITE_END();
};
-void Test::testReferenceDispose() {
+TEST_F(Test, testReferenceDispose) {
css::uno::Reference< css::uno::XWeak > w(new ::cppu::OWeakObject);
css::uno::Reference< css::uno::XAdapter > a(w->queryAdapter());
::rtl::Reference< Reference > r1(new RuntimeExceptionReference);
@@ -93,13 +88,10 @@ void Test::testReferenceDispose() {
a->addReference(r2.get());
a->addReference(r3.get());
w.clear();
-CPPUNIT_ASSERT(r1->isDisposed());
-CPPUNIT_ASSERT(r2->isDisposed());
-CPPUNIT_ASSERT(r3->isDisposed());
+ASSERT_TRUE(r1->isDisposed());
+ASSERT_TRUE(r2->isDisposed());
+ASSERT_TRUE(r3->isDisposed());
}
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, "alltests");
-
}
-NOADDITIO
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - slideshow/prj slideshow/test
slideshow/prj/build.lst |1
slideshow/test/demoshow.cxx | 14 +
slideshow/test/main.cxx | 28 ++
slideshow/test/makefile.mk | 37 +--
slideshow/test/slidetest.cxx | 508 ++-
slideshow/test/testshape.cxx | 12 -
slideshow/test/testview.cxx | 24 +-
slideshow/test/views.cxx | 49 +---
8 files changed, 329 insertions(+), 344 deletions(-)
New commits:
commit db55c60c645e6c11f28d47f84cc3ab725a247037
Author: Damjan Jovanovic
Date: Sun Aug 30 02:16:21 2015 +
#i125003# migrate main/slideshow from cppunit to Google Test
and run it on every build.
diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst
index 60989f8..1de7506 100644
--- a/slideshow/prj/build.lst
+++ b/slideshow/prj/build.lst
@@ -9,3 +9,4 @@ pe slideshow\source\engine\transitions nmake
- all pe_transitions pe_inc NULL
pe slideshow\source\engine\animationnodes nmake - all
pe_animationnodes pe_inc NULL
pe slideshow\source\engine\activities nmake - all
pe_activities pe_inc NULL
pe slideshow\util nmake
- all pe_util pe_shapes pe_slide pe_activities pe_animationnodes
pe_transitions pe_engine NULL
+pe slideshow\test nmake
- all pe_test pe_shapes pe_slide pe_activities pe_animationnodes
pe_transitions pe_engine pe_inc NULL
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index a78e6ca..8defb4f 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -48,7 +48,7 @@
#include
#include
-#include
+#include
#include
#include
#include
@@ -111,6 +111,17 @@ public:
aEvent );
}
+virtual ::com::sun::star::awt::Rectangle SAL_CALL getCanvasArea( ) throw
(::com::sun::star::uno::RuntimeException)
+{
+// FIXME:
+::com::sun::star::awt::Rectangle r;
+r.X = 0;
+r.Y = 0;
+r.Width = 0;
+r.Height = 0;
+return r;
+}
+
private:
virtual ~View() {}
@@ -452,6 +463,7 @@ void DemoWindow::init()
{
uno::Reference< drawing::XDrawPage > xSlide( new DummySlide );
mxShow->displaySlide( xSlide,
+ NULL,
uno::Reference< animations::XAnimationNode
>(),
uno::Sequence< beans::PropertyValue >() );
mxShow->setProperty( beans::PropertyValue(
diff --git a/slideshow/test/main.cxx b/slideshow/test/main.cxx
new file mode 100644
index 000..df14e5b
--- /dev/null
+++ b/slideshow/test/main.cxx
@@ -0,0 +1,28 @@
+/**
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk
index a4c394c..c9b6622 100644
--- a/slideshow/test/makefile.mk
+++ b/slideshow/test/makefile.mk
@@ -26,7 +26,6 @@ PRJ=..
PRJNAME=slideshow
PRJINC=$(PRJ)$/source
TARGET=tests
-TARGETTYPE=GUI
ENABLE_EXCEPTIONS=TRUE
@@ -38,37 +37,47 @@ ENABLE_EXCEPTIONS=TRUE
# --- Common --
# BEGIN target1 ---
-SHL1OBJS= \
+
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
+
+APP1OBJS= \
+$(SLO)$/main.obj \
$(SLO)$/views.obj\
$(SLO)$/slidetest.obj \
$(SLO)$/testshape.obj \
$(SLO)$/testview.obj
-SHL1TARGET= tests
-SHL1STDLIBS= $(SALLIB)\
+APP1TARGET= tests
+APP1STDLIBS= $(SALLIB)\
$(BASEGFXLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - cppu/prj cppu/qa desktop/qa o3tl/qa
cppu/prj/build.lst |1
cppu/qa/main.cxx | 28
cppu/qa/makefile.mk| 69 -
cppu/qa/test_any.cxx | 1241 +++--
cppu/qa/test_recursion.cxx | 17
cppu/qa/test_reference.cxx | 31
cppu/qa/test_unotype.cxx | 456 -
cppu/qa/version.map| 30
desktop/qa/deployment_misc/main.cxx| 28
desktop/qa/deployment_misc/makefile.mk | 36
desktop/qa/deployment_misc/test_dp_version.cxx | 21
desktop/qa/deployment_misc/version.map | 30
o3tl/qa/export.map | 30
o3tl/qa/main.cxx | 28
o3tl/qa/makefile.mk| 53 -
o3tl/qa/test-cow_wrapper.cxx | 161 +--
o3tl/qa/test-heap_ptr.cxx | 202 +---
o3tl/qa/test-range.cxx | 214 ++--
o3tl/qa/test-vector_pool.cxx | 80 -
19 files changed, 1231 insertions(+), 1525 deletions(-)
New commits:
commit 61224f2be25942cee9f506f5311c619539c8
Author: Damjan Jovanovic
Date: Sun Aug 30 09:09:06 2015 +
#i125003# migrate main/o3tl from cppunit to Google Test
diff --git a/o3tl/qa/export.map b/o3tl/qa/export.map
deleted file mode 100644
index ec49c45..000
--- a/o3tl/qa/export.map
+++ /dev/null
@@ -1,30 +0,0 @@
-#**
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**
-
-
-
-UDK_3_0_0 {
-global:
-cppunitTestPlugIn;
-
-local:
-*;
-};
diff --git a/o3tl/qa/main.cxx b/o3tl/qa/main.cxx
new file mode 100644
index 000..df14e5b
--- /dev/null
+++ b/o3tl/qa/main.cxx
@@ -0,0 +1,28 @@
+/**
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index 7693185..419694a 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -20,73 +20,48 @@
#**
-
-.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
-
-@all:
-.IF "$(GUI)" == "OS2"
-@echo "Skipping, cppunit broken."
-.ELIF "$(WITH_CPPUNIT)" != "YES"
-@echo "cppunit disabled. nothing do do."
-.END
-
-.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
-
PRJ=..
-
PRJNAME=o3tl
TARGET=tests
ENABLE_EXCEPTIONS=TRUE
+
# --- Settings -
.INCLUDE : settings.mk
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+
+.ELS
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - extensions.lst salhelper/prj salhelper/qa sal/prj sal/qa
extensions.lst |2
sal/prj/build.lst |1
sal/qa/ByteSequence/ByteSequence.cxx | 253 +++--
sal/qa/ByteSequence/main.cxx | 28 +++
sal/qa/ByteSequence/makefile.mk| 25 +--
sal/qa/osl/condition/osl_Condition.cxx |3
sal/qa/osl/thread/makefile.mk | 26 +--
sal/qa/osl/thread/test_thread.cxx | 55 +++
sal/qa/osl/thread/version.map | 30 ---
salhelper/prj/build.lst|1
salhelper/qa/main.cxx | 28 +++
salhelper/qa/makefile.mk | 26 +--
salhelper/qa/test_api.cxx | 122 +--
salhelper/qa/version.map | 26 ---
14 files changed, 286 insertions(+), 340 deletions(-)
New commits:
commit c77bd087b86f22ca5620eaf068537fca712317be
Author: Damjan Jovanovic
Date: Sun Aug 30 18:00:24 2015 +
Put the main function in the test file instead of a separate missing file.
diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk
index 7998e01..252d31d 100644
--- a/sal/qa/osl/thread/makefile.mk
+++ b/sal/qa/osl/thread/makefile.mk
@@ -36,7 +36,7 @@ all:
.ELSE
APP1TARGET = $(TARGET)
-APP1OBJS = $(SLO)$/test_thread.obj $(SLO)$/main.obj
+APP1OBJS = $(SLO)$/test_thread.obj
APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
APP1RPATH = NONE
APP1TEST = enabled
diff --git a/sal/qa/osl/thread/test_thread.cxx
b/sal/qa/osl/thread/test_thread.cxx
index 38896b5..afa5ead 100644
--- a/sal/qa/osl/thread/test_thread.cxx
+++ b/sal/qa/osl/thread/test_thread.cxx
@@ -78,3 +78,9 @@ TEST_F(Test, test) {
}
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}
+
commit 0782738ecaed1a6915895ccf20af9e9fbb785563
Author: Damjan Jovanovic
Date: Sun Aug 30 17:35:41 2015 +
#i125003# migrate main/sal/qa/osl/thread from cppunit to Google Test
and run it on every build.
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 4b568a8..d8d03b8 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -24,4 +24,5 @@ sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer
sa_cppunittester sa_util
sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_cppunittester sa_util NULL
sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_cppunittester sa_util
NULL
sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname
sa_cppunittester sa_util NULL
+sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_cppunittester sa_util NULL
sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL
diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk
index 115fc8e..7998e01 100644
--- a/sal/qa/osl/thread/makefile.mk
+++ b/sal/qa/osl/thread/makefile.mk
@@ -29,20 +29,18 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-DLLPRE = # no leading "lib" on .so files
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_thread.obj
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
+APP1TARGET = $(TARGET)
+APP1OBJS = $(SLO)$/test_thread.obj $(SLO)$/main.obj
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
.INCLUDE: target.mk
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-testshl2 $(SHL1TARGETN)
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/sal/qa/osl/thread/test_thread.cxx
b/sal/qa/osl/thread/test_thread.cxx
index f09636f..38896b5 100644
--- a/sal/qa/osl/thread/test_thread.cxx
+++ b/sal/qa/osl/thread/test_thread.cxx
@@ -26,11 +26,11 @@
#include "sal/config.h"
-#include "testshl/simpleheader.hxx"
#include "osl/conditn.hxx"
#include "osl/thread.hxx"
#include "osl/time.h"
#include "sal/types.h"
+#include "gtest/gtest.h"
namespace {
@@ -45,41 +45,36 @@ private:
virtual void SAL_CALL onTerminated() {
m_cond.set();
-CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, global.wait());
+ASSERT_EQ(osl::Condition::result_ok, global.wait());
}
osl::Condition & m_cond;
};
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
public:
-// Nondeterministic, best effort test that an osl::Thread can be destroyed
-// (and in particular osl_destroyThread---indirectly---be called) before
the
-// corresponding thread has terminated:
-void test() {
-for (int i = 0; i < 50; ++i) {
-osl::Condition c;
-Thread t(c);
-CPPUNIT_ASSERT(t.create());
-// Make sure virtual Thread::run/onTerminated are called before
-// Thread::~Thread:
-CPPUNI
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/qa
sal/qa/rtl/uuid/makefile.mk | 26 +++
sal/qa/rtl/uuid/rtl_Uuid.cxx | 140 ---
2 files changed, 78 insertions(+), 88 deletions(-)
New commits:
commit 933db9c80d5510abdd3569a025f654102d83aaf5
Author: Damjan Jovanovic
Date: Sun Aug 30 19:10:42 2015 +
#i125003# migrate main/sal/qa/rtl/uuid from cppunit to Google Test.
diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk
index 80f6b9a..df42f80 100644
--- a/sal/qa/rtl/uuid/makefile.mk
+++ b/sal/qa/rtl/uuid/makefile.mk
@@ -33,32 +33,30 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
# BEGIN
# auto generated Target:joblist by codegen.pl
-SHL1OBJS= \
+APP1OBJS= \
$(SLO)$/rtl_Uuid.obj
-SHL1TARGET= rtl_Uuid
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+APP1TARGET= rtl_Uuid
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
-DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
# END --
-#--- All object files
---
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
# --- Targets --
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 1016af1..42a6eed 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -27,7 +27,6 @@
#include
#include
-#include
#include
#include
#include
@@ -37,16 +36,18 @@
#include
#endif
+#include "gtest/gtest.h"
+
using namespace rtl;
/** print a UNI_CODE String. And also print some comments of the string.
*/
inline void printUString( const ::rtl::OUString & str, const sal_Char * msg =
"" )
{
-t_print("#%s #printUString_u# ", msg );
+printf("#%s #printUString_u# ", msg );
rtl::OString aString;
aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-t_print("%s\n", (char *)aString.getStr( ) );
+printf("%s\n", (char *)aString.getStr( ) );
}
/
@@ -71,21 +72,23 @@ void printUuid( sal_uInt8 *pNode )
namespace rtl_Uuid
{
-class createUuid : public CppUnit::TestFixture
+class createUuid : public ::testing::Test
{
public:
// initialise your test code values here.
-void setUp()
+void SetUp()
{
}
-void tearDown()
+void TearDown()
{
}
+}; // class createUuid
+
#define TEST_UUID 20
-void createUuid_001()
-{
+TEST_F(createUuid, createUuid_001)
+{
sal_uInt8 aNode[TEST_UUID][16];
sal_Int32 i,i2;
for( i = 0 ; i < TEST_UUID ; i ++ )
@@ -106,11 +109,12 @@ public:
if ( bRes == sal_False )
break;
}
-CPPUNIT_ASSERT_MESSAGE("createUuid: every uuid must be different.", bRes
== sal_True );
-}
- /*
-void createUuid_002()
-{
+ASSERT_TRUE(bRes == sal_True) << "createUuid: every uuid must be
different.";
+}
+
+/*
+TEST_F(createUuid, createUuid_002)
+{
sal_uInt8 pNode[16];
sal_uInt8 aNode[TEST_UUID][16];
sal_Int32 i,i2;
@@ -133,14 +137,8 @@ public:
if ( bRes == sal_False )
break;
}
-CPPUNIT_ASSERT_MESSAGE("createUuid: every uuid must be different.", bRes
== sal_True );
-}*/
-
-CPPUNIT_TEST_SUITE(createUuid);
-CPPUNIT_TEST(createUuid_001);
-//CPPUNIT_TEST(createUuid_002);
-CPPUNIT_TEST_SUITE_END();
-}; // class createUuid
+ASSERT_TRUE(bRes == sal_True) << "createUuid: every uuid must be
different.";
+}*/
namespace ThreadHelper
{
@@ -155,70 +153,64 @@ namespace ThreadHelper
}
}
-class createNamedUuid : public CppUnit::TestFixture
+class createNamedUuid : public ::testing::Test
{
public:
// initialise your test code values here.
-void setUp()
+void SetUp()
{
}
-void tearDown()
+void TearDown()
{
}
+}; // class createNamedUuid
-void createNamedUuid_001()
-{
-sal_uInt8 NameSpace_DNS[16] = RTL_UUID_NAMESPACE_DNS;
-sal_uInt8 NameSpace_URL[16] = RTL_UUID_NAMESPACE_URL;
-sal_uInt8 pPriorCalculatedUUID[16] = {
-0x52,0xc9,0x30,0xa5,
-0xd1,0x61,0x3b,0x16,
-0x98,0xc5,0xf8,0xd1,
-0x10,0x10,0x6d,0x4d };
-
-sal_uI
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/qa
sal/qa/rtl/uri/makefile.mk | 39 ++
sal/qa/rtl/uri/rtl_Uri.cxx | 197 ++-
sal/qa/rtl/uri/rtl_testuri.cxx | 260 +
3 files changed, 225 insertions(+), 271 deletions(-)
New commits:
commit 33abd0564a8a62d8452892d43906c02ef57553ee
Author: Damjan Jovanovic
Date: Mon Aug 31 02:16:25 2015 +
#i125003# migrate main/sal/qa/rtl/uri from cppunit to Google Test.
diff --git a/sal/qa/rtl/uri/makefile.mk b/sal/qa/rtl/uri/makefile.mk
index 78b0c01..30021d6 100644
--- a/sal/qa/rtl/uri/makefile.mk
+++ b/sal/qa/rtl/uri/makefile.mk
@@ -32,40 +32,37 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
# --- BEGIN
-SHL1OBJS= \
+APP1OBJS= \
$(SLO)$/rtl_Uri.obj
-SHL1TARGET= rtl_uri_simple
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+APP1TARGET= rtl_uri_simple
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
# END --
# --- BEGIN
-SHL2OBJS= \
+APP2OBJS= \
$(SLO)$/rtl_testuri.obj
-SHL2TARGET= rtl_Uri
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL2IMPLIB= i$(SHL2TARGET)
-DEF2NAME=$(SHL2TARGET)
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+APP2TARGET= rtl_Uri
+APP2STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP2RPATH = NONE
+APP2TEST = enabled
# END --
-#--- All object files
---
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
-
# --- Targets --
.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
+
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 41a4c39..6ef2a0a 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -31,7 +31,7 @@
#include
#include
-#include
+#include "gtest/gtest.h"
//
-
@@ -71,15 +71,16 @@ namespace Stringtest
//
-
-class Convert : public CppUnit::TestFixture
+class Convert : public ::testing::Test
{
+protected:
rtl::OUString m_aStr;
public:
/*
rtl::OString toUTF8(rtl::OUString const& _suStr)
{
rtl::OString sStrAsUTF8 = rtl::OUStringToOString(_suStr,
RTL_TEXTENCODING_UTF8);
-t_print("%s\n", escapeString(sStrAsUTF8).getStr());
+printf("%s\n", escapeString(sStrAsUTF8).getStr());
return sStrAsUTF8;
}
*/
@@ -97,7 +98,7 @@ namespace Stringtest
void showContent(rtl::OUString const& _suStr)
{
rtl::OString sStr = convertToOString(_suStr);
-t_print("%s\n", sStr.getStr());
+printf("%s\n", sStr.getStr());
}
void toUTF8_mech(rtl::OUString const& _suStr, rtl_UriEncodeMechanism
_eMechanism)
@@ -123,39 +124,15 @@ namespace Stringtest
void toUTF8(rtl::OUString const& _suStr)
{
-t_print("rtl_UriEncodeIgnoreEscapes \n");
+printf("rtl_UriEncodeIgnoreEscapes \n");
toUTF8_mech(_suStr, rtl_UriEncodeIgnoreEscapes);
-t_print("\n");
-t_print("# rtl_UriEncodeKeepEscapes\n");
+printf("\n");
+printf("# rtl_UriEncodeKeepEscapes\n");
toUTF8_mech(_suStr, rtl_UriEncodeKeepEscapes);
-t_print("\n");
-t_print("# rtl_UriEncodeCheckEscapes\n");
+printf("\n");
+printf("# rtl_UriEncodeCheckEscapes\n");
toUTF8_mech(_suStr, rtl_UriEncodeCheckEscapes);
-t_print("\n");
-}
-
-void test_FromUTF8_001()
-{
-// string --> ustring
-rtl::OString sStrUTF8("h%C3%A4llo");
-rtl::OUString suStrUTF8 = rtl::OStringToOUString(sStrUTF8,
RTL_TEXTENCODING_ASCII_US);
-
-// UTF8 --> real ustring
-rtl::OUString suStr_UriDecodeToIuri =
rtl::Uri::dec
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/osl
sal/osl/unx/backtrace.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 7d41b0a9559a388fe558cf7e8d81e4909a785af3
Author: Damjan Jovanovic
Date: Sun Dec 13 23:55:35 2015 +
Use %tx to print ptrdiff_t.
Patch by: me
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index b8a2726..fadd07b 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -116,12 +116,12 @@ void backtrace_symbols_fd( void **buffer, int size, int
fd )
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname,
offset );
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)",
dli.dli_sname, offset );
}
}
fprintf( fp, "[%p]\n", *pFramePtr );
@@ -270,12 +270,12 @@ void backtrace_symbols_fd( void **buffer, int size, int
fd )
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname,
offset );
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)",
dli.dli_sname, offset );
}
}
fprintf( fp, "[%p]\n", *pFramePtr );
@@ -336,12 +336,12 @@ void backtrace_symbols_fd( void **buffer, int size, int
fd )
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname,
offset );
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+ fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)",
dli.dli_sname, offset );
}
}
fprintf( fp, "[%p]\n", *pFramePtr );
commit 25f185144085ebe06405a5d8f19a11544ed7f794
Author: Damjan Jovanovic
Date: Sun Dec 13 23:35:09 2015 +
Use %p to print pointers in sal backtraces instead of 0x%x + conversion to
integer.
Patch by: me
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 4ba05cc..b8a2726 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -124,7 +124,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
}
}
-fprintf( fp, "[0x%x]\n", *pFramePtr );
+fprintf( fp, "[%p]\n", *pFramePtr );
}
fflush( fp );
@@ -192,7 +192,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)",
dli.dli_sname, offset );
}
}
-fprintf( fp, "[0x%p]\n", *pFramePtr );
+fprintf( fp, "[%p]\n", *pFramePtr );
}
fflush( fp );
fclose( fp );
@@ -278,7 +278,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
}
}
-fprintf( fp, "[0x%x]\n", *pFramePtr );
+fprintf( fp, "[%p]\n", *pFramePtr );
}
fflush( fp );
@@ -344,7 +344,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
}
}
-fprintf( fp, "[0x%x]\n", (unsigned int)*pFramePtr );
+fprintf( fp, "[%p]\n", *pFramePtr );
}
fflush( fp );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source
basic/source/runtime/methods.cxx | 15 +++
basic/source/runtime/rtlproto.hxx |1 +
basic/source/runtime/stdobj.cxx |2 +-
3 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit fa1315d25186643ea537972609c117e0c9bb1fbc
Author: Damjan Jovanovic
Date: Tue Dec 15 04:40:45 2015 +
#i19221# Print Tab(5); "Hello" does not work
Implement the Tab() function in AOO Basic.
Patch by: me
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 79c6cbf..26d4fd9 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1708,6 +1708,21 @@ RTLFUNC(String)
}
}
+RTLFUNC(Tab)
+{
+(void)pBasic;
+(void)bWrite;
+
+if ( rPar.Count() < 2 )
+StarBASIC::Error( SbERR_BAD_ARGUMENT );
+else
+{
+String aStr;
+aStr.Fill( (sal_uInt16)(rPar.Get(1)->GetLong() ), '\t');
+rPar.Get(0)->PutString( aStr );
+}
+}
+
RTLFUNC(Tan)
{
(void)pBasic;
diff --git a/basic/source/runtime/rtlproto.hxx
b/basic/source/runtime/rtlproto.hxx
index 12775db..92a8842 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/runtime/rtlproto.hxx
@@ -193,6 +193,7 @@ extern RTLFUNC(Str);
extern RTLFUNC(StrComp);
extern RTLFUNC(String);
extern RTLFUNC(StrReverse);
+extern RTLFUNC(Tab);
extern RTLFUNC(Tan);
extern RTLFUNC(UCase);
extern RTLFUNC(Val);
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index eb3cdcc..7a18184 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -521,7 +521,7 @@ static Methods aMethods[] = {
{ "Switch", SbxVARIANT, 2 | _FUNCTION, RTLNAME(Switch),0 },
{ "Expression", SbxVARIANT, 0,NULL,0 },
{ "Value",SbxVARIANT, 0,NULL,0 },
-
+{ "Tab",SbxSTRING, 1 | _FUNCTION, RTLNAME(Tab),0 },
{ "Tan",SbxDOUBLE,1 | _FUNCTION, RTLNAME(Tan),0 },
{ "number", SbxDOUBLE, 0,NULL,0 },
{ "Time", SbxVARIANT, _LFUNCTION,RTLNAME(Time),0},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/backtrace.c |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 66add63dda22321476653d06a61bc61090fafc58 Author: Damjan Jovanovic Date: Sun Dec 13 23:35:09 2015 + Use %p to print pointers in sal backtraces.. instead of 0x%x + conversion to integer. Patch by: me (cherry picked from commit 25f185144085ebe06405a5d8f19a11544ed7f794) Change-Id: I49197aed7bc2dc92a4b54d9aa6a7dce95ebadcfb diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c index a8177e6..a03ab7d 100644 --- a/sal/osl/unx/backtrace.c +++ b/sal/osl/unx/backtrace.c @@ -120,7 +120,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset ); } } -fprintf( fp, "[0x%x]\n", *pFramePtr ); +fprintf( fp, "[%p]\n", *pFramePtr ); } fflush( fp ); @@ -187,7 +187,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)", dli.dli_sname, offset ); } } -fprintf( fp, "[0x%p]\n", *pFramePtr ); +fprintf( fp, "[%p]\n", *pFramePtr ); } fflush( fp ); fclose( fp ); @@ -257,7 +257,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) fprintf( fp, "(%s+0x%tx)", dli.dli_sname, offset ); } } -fprintf( fp, "[0x%x]\n", (unsigned int)*pFramePtr ); +fprintf( fp, "[%p]\n", *pFramePtr ); } fflush( fp ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/backtrace.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cfe08df695c046371c4361a434176e6381e3e064
Author: Damjan Jovanovic
Date: Sun Dec 13 23:55:35 2015 +
Use %tx to print ptrdiff_t.
Patch by: me
(cherry picked from commit 7d41b0a9559a388fe558cf7e8d81e4909a785af3)
Change-Id: I5e087de043bf454268e4a3ccf24d9e25de3735ee
diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index a03ab7d..c5fbfbf 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -112,12 +112,12 @@ void backtrace_symbols_fd( void **buffer, int size, int
fd )
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_fbase;
-fprintf( fp, "%s+0x%x", dli.dli_fname, offset );
+fprintf( fp, "%s+0x%" SAL_PRI_PTRDIFFT "x", dli.dli_fname,
offset );
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr - (ptrdiff_t)dli.dli_saddr;
-fprintf( fp, "(%s+0x%x)", dli.dli_sname, offset );
+fprintf( fp, "(%s+0x%" SAL_PRI_PTRDIFFT "x)",
dli.dli_sname, offset );
}
}
fprintf( fp, "[%p]\n", *pFramePtr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source
basic/source/comp/loops.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cbd43d0cb1165add5b9b559c3608a93ea631da13
Author: Damjan Jovanovic
Date: Tue Dec 15 17:31:31 2015 +
#i126272# OpenOffice.org Basic compile error : if statement followed by End
If - in next Line ???
Allow the Else in a single-line If statement to be terminated by a comment
instead of only EOL.
Patch by: me
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index 6a67804..d0544d1 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -130,7 +130,7 @@ void SbiParser::If()
{
if( !Parse() ) break;
eTok = Peek();
-if( eTok == EOLN )
+if( eTok == EOLN || eTok == REM )
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/comp/loops.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a22702ab0daff2bf2cdf573feda256606a705383
Author: Damjan Jovanovic
Date: Tue Dec 15 17:31:31 2015 +
Resolves: #i126272# compile error : if statement followed by End If...
- in next Line ???
Allow the Else in a single-line If statement to be terminated by a comment
instead of only EOL.
Patch by: me
(cherry picked from commit cbd43d0cb1165add5b9b559c3608a93ea631da13)
Change-Id: I3dcf014c9fe501bc9770ae3cfd69e7730c0b86cb
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index a77b9e2..fb9680d 100644
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -124,7 +124,7 @@ void SbiParser::If()
{
if( !Parse() ) break;
eTok = Peek();
-if( eTok == EOLN )
+if( eTok == EOLN || eTok == REM )
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - formula/inc formula/source sc/inc sc/source sc/util
formula/inc/formula/compiler.hrc |8 +-
formula/inc/formula/opcode.hxx |4 +
formula/source/core/resource/core_resource.src | 18
sc/inc/helpids.h |4 -
sc/source/core/inc/interpre.hxx| 13 +++
sc/source/core/tool/interpr1.cxx | 66
sc/source/core/tool/interpr4.cxx |3
sc/source/ui/src/scfuncs.src | 100 +
sc/util/hidother.src |3
9 files changed, 216 insertions(+), 3 deletions(-)
New commits:
commit bb122fab960b1df17bda229dab79841e96aaab11
Author: Damjan Jovanovic
Date: Sun Nov 22 06:58:12 2015 +
#i126668# Addition of Bitwise Arithmetic Operations (BITAND, BITOR and
BITXOR) in calc
Patch by: Pathangi Janardhanan Jatinshravan
Review by: me
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index 8f49f46..49f6f7f 100644
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
@@ -397,9 +397,13 @@
#define SC_OPCODE_RIGHTB401
#define SC_OPCODE_LEFTB 402
#define SC_OPCODE_MIDB 403
-#define SC_OPCODE_STOP_2_PAR404
+#define SC_OPCODE_BITAND404
+#define SC_OPCODE_BITOR 405
+#define SC_OPCODE_BITXOR406
-#define SC_OPCODE_LAST_OPCODE_ID403 /* last OpCode */
+#define SC_OPCODE_STOP_2_PAR407
+
+#define SC_OPCODE_LAST_OPCODE_ID406 /* last OpCode */
/*** Interna ***/
#define SC_OPCODE_INTERNAL_BEGIN
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index f1bbb75..0cd908e 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -393,6 +393,10 @@ enum OpCodeEnum
ocEuroConvert = SC_OPCODE_EUROCONVERT,
ocNumberValue = SC_OPCODE_NUMBERVALUE,
ocXor = SC_OPCODE_XOR,
+//bitwise functions
+ocBitAnd= SC_OPCODE_BITAND,
+ocBitOr = SC_OPCODE_BITOR,
+ocBitXor= SC_OPCODE_BITXOR,
// internal stuff
ocInternalBegin = SC_OPCODE_INTERNAL_BEGIN,
ocTTT = SC_OPCODE_TTT,
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index d723cb1..a29acd0 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -349,6 +349,9 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_GAMMA { Text = "GAMMA" ; };
String SC_OPCODE_CHISQ_DIST { Text = "CHISQDIST" ; };
String SC_OPCODE_CHISQ_INV { Text = "CHISQINV" ;};
+String SC_OPCODE_BITAND { Text= "BITAND" ; };
+String SC_OPCODE_BITOR { Text= "BITOR" ; };
+String SC_OPCODE_BITXOR { Text= "BITXOR" ; };
/* BEGIN defined ERROR.TYPE() values. */
String SC_OPCODE_ERROR_NULL{ Text = "#NULL!" ; };
@@ -686,6 +689,9 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_GAMMA { Text = "GAMMA" ; };
String SC_OPCODE_CHISQ_DIST { Text = "CHISQDIST" ; };
String SC_OPCODE_CHISQ_INV { Text = "CHISQINV" ;};
+String SC_OPCODE_BITAND { Text = "BITAND" ; };
+String SC_OPCODE_BITOR { Text = "BITOR" ; };
+String SC_OPCODE_BITXOR { Text = "BITXOR" ; };
/* BEGIN defined ERROR.TYPE() values. */
String SC_OPCODE_ERROR_NULL{ Text = "#NULL!" ; };
@@ -1910,6 +1916,18 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "CHISQINV" ;
};
+String SC_OPCODE_BITAND
+{
+Text [ en-US ] = "BITAND";
+};
+String SC_OPCODE_BITOR
+{
+Text [ en-US ] = "BITOR";
+};
+String SC_OPCODE_BITXOR
+{
+Text [ en-US ] = "BITXOR";
+};
/* BEGIN defined ERROR.TYPE() values. */
/* ERROR.TYPE( #NULL! ) == 1 */
String SC_OPCODE_ERROR_NULL
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index d9dd5f3..ae09a53 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -774,4 +774,6 @@
#define HID_FUNC_UNICODE
"SC_HID_FUNC_UNICODE"
#define HID_FUNC_UNICHAR
"SC_HID_FUNC_UNICHAR"
#define HID_FUNC_NUMBERVALUE
"SC_HID_FUNC_NUMBERVALUE"
-
+#define HID_FUNC_BITAND
"SC_HID_FUNC_BITAND"
+#define HID_FUNC_BITOR
"SC_HID_FUNC_BITOR"
+#define HID_FUNC_BITXOR
"SC_HID_FUNC_BITXOR"
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hx
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basic/source
basic/source/comp/token.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f8a51d0f5a645704bc2bdc939474ac931d9c Author: Damjan Jovanovic Date: Tue Nov 24 18:56:10 2015 + #i117960# Basic: Line Input doesn't work in single-line If i92642 added the ability to use certain keywords as variable names (eg. name = 1, line = "hi"), but also caused a regression where "Line Input" is broken in single-line If statements. This patch fixes that by allowing Then and Else to also be the start-of-line tokens expected to immediately preceed the "Line" token in order for that "Line" token to be recognized a keyword instead of a variable name. Also added FVT spreadsheet tests for "Line" as both a variable name and as "Line Input". Patch by: me diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index bf8c5ef..655655e 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -557,7 +557,8 @@ SbiToken SbiTokenizer::Next() } special: // #i92642 -bool bStartOfLine = (eCurTok == NIL || eCurTok == REM || eCurTok == EOLN); +bool bStartOfLine = (eCurTok == NIL || eCurTok == REM || eCurTok == EOLN || +eCurTok == THEN || eCurTok == ELSE); // single line If if( !bStartOfLine && (tp->t == NAME || tp->t == LINE) ) return eCurTok = SYMBOL; else if( tp->t == TEXT ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/source
fpicker/source/office/OfficeFilePicker.cxx | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 42d181e761c9903bfe5dd71334cadacebd1d0dc8
Author: Damjan Jovanovic
Date: Wed Nov 25 18:49:36 2015 +
#i96720# FilePicker: setDefaultName, setDefaultDirectory "broken"
Display the proposed filename even when the URL
specified for the file picker directory is invalid.
As the Win32 file picker sadly allows both paths and URLs
for directories, users try paths on other more
restrictive platforms, and since the file picker there
shows neither the directory nor the file, they wrongly
conclude both are broken.
Patch by: me
diff --git a/fpicker/source/office/OfficeFilePicker.cxx
b/fpicker/source/office/OfficeFilePicker.cxx
index 79af62b..b25cd58 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -171,19 +171,29 @@ void SvtFilePicker::prepareExecute()
// --**-- doesn't match the spec yet
if ( m_aDisplayDirectory.getLength() > 0 || m_aDefaultName.getLength() > 0
)
{
+sal_Bool isFileSet = sal_False;
if ( m_aDisplayDirectory.getLength() > 0 )
{
-INetURLObject aPath( m_aDisplayDirectory );
+INetURLObject aPath;
+INetURLObject givenPath( m_aDisplayDirectory );
+if (!givenPath.HasError())
+aPath = givenPath;
+else
+{
+INetURLObject aStdDirObj( SvtPathOptions().GetWorkPath() );
+aPath = aStdDirObj;
+}
if ( m_aDefaultName.getLength() > 0 )
{
aPath.insertName( m_aDefaultName );
getDialog()->SetHasFilename( true );
}
String sPath = aPath.GetMainURL( INetURLObject::NO_DECODE );
-getDialog()->SetPath( aPath.GetMainURL( INetURLObject::NO_DECODE )
);
+getDialog()->SetPath( sPath );
+isFileSet = sal_True;
}
-else if ( m_aDefaultName.getLength() > 0 )
+if ( !isFileSet && m_aDefaultName.getLength() > 0 )
{
getDialog()->SetPath( m_aDefaultName );
getDialog()->SetHasFilename( true );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
