javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
| 10 ++--
qadevOOo/runner/helper/APIDescGetter.java
| 7 +-
qadevOOo/runner/helper/BuildEnvTools.java
| 8 ++-
qadevOOo/runner/stats/Summarizer.java
| 7 +-
qadevOOo/runner/util/DBTools.java
| 22 ++++----
qadevOOo/runner/util/XMLTools.java
| 12 ++--
qadevOOo/runner/util/dbg.java
| 18 +++----
qadevOOo/runner/util/utils.java
| 7 +-
qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
| 6 +-
qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
| 8 ++-
qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java
| 6 +-
qadevOOo/tests/java/ifc/i18n/_XCollator.java
| 10 ++--
qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
| 8 +--
qadevOOo/tests/java/ifc/util/_XURLTransformer.java
| 5 +-
qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
| 14 ++---
qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
| 8 +--
qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
| 8 +--
qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
| 8 +--
qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
| 8 +--
sw/source/uibase/dbui/dbmgr.cxx
| 14 +++--
wizards/com/sun/star/wizards/db/QueryMetaData.java
| 7 +-
wizards/com/sun/star/wizards/db/SQLQueryComposer.java
| 13 ++---
wizards/com/sun/star/wizards/query/QuerySummary.java
| 16 +++---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
| 13 +++--
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
| 25 ++--------
25 files changed, 137 insertions(+), 131 deletions(-)
New commits:
commit 5ff0c0c283217fdb87f78e1f06c90db0af16b59f
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:56:20 2015 +0000
coverity#1326973 SBSC: String concatenation in loop using + operator
Change-Id: I8fb8afa2951201106443f76fde3f55ead24d43c2
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
index 63ae35e..e3a3a43 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
@@ -250,19 +250,21 @@ public class UnoUrl {
while (true) {
char c = ',';
- String aKey = "";
- String aValue = "";
+ StringBuffer sb = new StringBuffer();
while ((pos < paramString.length())
&& ((c = paramString.charAt(pos++)) != '=')) {
- aKey += c;
+ sb.append(c);
}
+ String aKey = sb.toString();
+ sb = new StringBuffer();
while ((pos < paramString.length())
&& ((c = paramString.charAt(pos++)) != ',')
&& c != ';') {
- aValue += c;
+ sb.append(c);
}
+ String aValue = sb.toString();
if ((aKey.length() > 0) && (aValue.length() > 0)) {
commit f852edc6db76ee8569374bd1997a579201a5493a
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:51:25 2015 +0000
coverity#1326974 SBSC: String concatenation in loop using + operator
Change-Id: Ic1130017c02a470ebd213704ad5c56b6747dfee0
diff --git a/qadevOOo/runner/helper/APIDescGetter.java
b/qadevOOo/runner/helper/APIDescGetter.java
index 19fdaac..0320fb5 100644
--- a/qadevOOo/runner/helper/APIDescGetter.java
+++ b/qadevOOo/runner/helper/APIDescGetter.java
@@ -392,7 +392,6 @@ public class APIDescGetter extends DescGetter
private static String createClassName(String _ifc_name)
{
StringTokenizer st = new StringTokenizer(_ifc_name, ":");
- String className = "";
int count = 3;
@@ -401,6 +400,8 @@ public class APIDescGetter extends DescGetter
count = 4;
}
+ StringBuilder className = new StringBuilder();
+
for (int i = 0; st.hasMoreTokens(); i++)
{
String token = st.nextToken();
@@ -414,10 +415,10 @@ public class APIDescGetter extends DescGetter
token = "_" + token;
}
- className += ("." + token);
+ className.append(".").append(token);
}
}
- return className;
+ return className.toString();
}
private static String entryType;
commit f6fd796b779c81330e8657140001134f03e6cc29
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:49:43 2015 +0000
coverity#1326975 SBSC: String concatenation in loop using + operator
Change-Id: I3c00520c0337f8d282c0c63f08a3de43bf52b2d9
diff --git a/qadevOOo/runner/helper/BuildEnvTools.java
b/qadevOOo/runner/helper/BuildEnvTools.java
index b967ee7..60d3284 100644
--- a/qadevOOo/runner/helper/BuildEnvTools.java
+++ b/qadevOOo/runner/helper/BuildEnvTools.java
@@ -150,14 +150,16 @@ public class BuildEnvTools {
separator = ";";
}
- String command = "";
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < commands.length; i++) {
if (i != 0) {
- command += separator;
+ sb.append(separator);
}
- command += commands[i];
+ sb.append(commands[i]);
}
+ String command = sb.toString();
+
if (mPlatform.equals(PropertyName.WNTMSCI)){
if (mCygwin){
String srcRoot = (String) param.get(PropertyName.SRC_ROOT);
commit 9c0539ad409f2f82076f8b37b9ab9fb6b7594444
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:47:10 2015 +0000
coverity#1326977 SBSC: String concatenation in loop using + operator
Change-Id: Ib92a893fc5c3cc89ce78733b95406d5ec415cb26
diff --git a/qadevOOo/runner/stats/Summarizer.java
b/qadevOOo/runner/stats/Summarizer.java
index ced7e3c..36addd5 100644
--- a/qadevOOo/runner/stats/Summarizer.java
+++ b/qadevOOo/runner/stats/Summarizer.java
@@ -63,7 +63,7 @@ public class Summarizer
}
if (failures.size() > 0)
{
- String errMsg = "";
+ StringBuilder errMsg = new StringBuilder();
String state = "COMPLETED.FAILED";
for (int j = 0; j < failures.size(); j++)
{
@@ -73,12 +73,11 @@ public class Summarizer
}
else
{
- errMsg +=
- failures.get(j) + " - " + states.get(j) + "\r\n";
+ errMsg.append(failures.get(j)).append(" -
").append(states.get(j)).append("\r\n");
}
}
entry.hasErrorMsg = true;
- entry.ErrorMsg = errMsg;
+ entry.ErrorMsg = errMsg.toString();
entry.State = state;
}
else if (entry.EntryType.equals("component") && knownIssues > 0)
commit bc353749e6be7906127e1f11b3802c462e19729c
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:45:35 2015 +0000
coverity#1326978 SBSC: String concatenation in loop using + operator
Change-Id: I1e87d33d12b246aa071d28af3eec69bf79c7bf6f
diff --git a/qadevOOo/runner/util/DBTools.java
b/qadevOOo/runner/util/DBTools.java
index 4fd764a..4410bf2 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -322,36 +322,36 @@ public class DBTools {
for(int i = 0; i < DBTools.TST_TABLE_VALUES.length; i++) {
- String query = "insert into " + tbl_name + " values (";
+ StringBuilder query = new StringBuilder("insert into " + tbl_name
+ " values (");
int j = 0;
while(j < DBTools.TST_TABLE_VALUES[i].length) {
if (j > 0) {
- query += ", ";
+ query.append(", ");
}
Object value = DBTools.TST_TABLE_VALUES[i][j];
if (value instanceof String ||
value instanceof Date) {
- query += "'";
+ query.append("'");
}
if (value instanceof Date) {
Date date = (Date)value;
- query += date.Year + "-" + date.Month +
- "-" + date.Day;
+
query.append(date.Year).append("-").append(date.Month).append(
+ "-").append(date.Day);
} else if (value instanceof Boolean) {
- query += (((Boolean)value).booleanValue())
- ? "1" : "0";
+ query.append((((Boolean)value).booleanValue())
+ ? "1" : "0");
} else {
- query += value;
+ query.append(value);
}
if (value instanceof String ||
value instanceof Date) {
- query += "'";
+ query.append("'");
}
j++;
}
- query += ")";
- statement.executeUpdate(query);
+ query.append(")");
+ statement.executeUpdate(query.toString());
}
}
commit 20cb57cde026c8cc6cf9470eb3100b6a884d864e
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:43:15 2015 +0000
coverity#1326979 SBSC: String concatenation in loop using + operator
Change-Id: Iddf881369ff8a177fba9ebe9a673291a9b8ed431
diff --git a/qadevOOo/runner/util/XMLTools.java
b/qadevOOo/runner/util/XMLTools.java
index 5feda48..6930a96 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -461,18 +461,18 @@ public class XMLTools {
*/
@Override
public String toString() {
- String ret = "<" + name ;
+ StringBuffer ret = new StringBuffer("<" + name);
for (int i = 0; i < attrList.length; i++) {
- ret += " " + attrList[i][0] + "=";
+ ret.append(" ").append(attrList[i][0]).append("=");
if (attrList[i][2] == null) {
- ret += "(not specified)";
+ ret.append("(not specified)");
} else {
- ret += "\"" + attrList[i][2] + "\"";
+ ret.append("\"").append(attrList[i][2]).append("\"");
}
}
- ret += ">";
+ ret.append(">");
- return ret ;
+ return ret.toString();
}
private boolean checkAttr(int attrListIdx, XAttributeList list) {
commit cd6b730536e7f9ae1b70a00a15ed83e853dfa357
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:40:48 2015 +0000
coverity#1326980 SBSC: String concatenation in loop using + operator
Change-Id: I91ae690e26a05dbe4424b7f2ac3bd9ad029ebf5c
diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java
index d7f77c5..ba06f3c 100644
--- a/qadevOOo/runner/util/dbg.java
+++ b/qadevOOo/runner/util/dbg.java
@@ -258,15 +258,15 @@ public class dbg {
public static void getSuppServices (Object aObject) {
XServiceInfo xSI =
UnoRuntime.queryInterface(XServiceInfo.class,aObject);
printArray(xSI.getSupportedServiceNames());
- String str="Therein not Supported Service";
+ StringBuilder str = new StringBuilder("Therein not Supported Service");
boolean notSupportedServices = false;
for (int i=0;i<xSI.getSupportedServiceNames().length;i++) {
if (! xSI.supportsService(xSI.getSupportedServiceNames()[i])) {
notSupportedServices = true;
- str+="\n" + xSI.getSupportedServiceNames()[i];
+ str.append("\n").append(xSI.getSupportedServiceNames()[i]);
}
}
if (notSupportedServices)
- System.out.println(str);
+ System.out.println(str.toString());
}
}
commit 66103ac97e38cf902f9d57bd142a8cd45b824862
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:39:24 2015 +0000
coverity#1326981 SBSC: String concatenation in loop using + operator
Change-Id: I4bcde379701e8f3542f8e54e59b529466213d72e
diff --git a/qadevOOo/runner/util/dbg.java b/qadevOOo/runner/util/dbg.java
index 2d711a1..d7f77c5 100644
--- a/qadevOOo/runner/util/dbg.java
+++ b/qadevOOo/runner/util/dbg.java
@@ -208,18 +208,18 @@ public class dbg {
if (ps.Value instanceof String[] ){
String[] values = (String[]) ps.Value;
- String oneValue = "value is an empty String[]";
+ StringBuilder oneValue = new StringBuilder("value is an empty
String[]");
if (values.length > 0){
- oneValue = "['";
+ oneValue.append("['");
for( int i=0; i < values.length; i++){
- oneValue += values[i];
- if (i+1 < values.length) oneValue += "';'";
+ oneValue.append(values[i]);
+ if (i+1 < values.length) oneValue.append("';'");
}
- oneValue += "']";
+ oneValue.append("']");
}
out.println("--------");
out.println(" Name: '" + ps.Name + "' contains String[]:");
- out.println(oneValue);
+ out.println(oneValue.toString());
out.println("--------");
} else if (ps.Value instanceof PropertyValue){
commit 825caafe02256f40ef98cc828eeb35b2783444e3
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:37:10 2015 +0000
coverity#1326982 SBSC: String concatenation in loop using + operator
Change-Id: Ia8cff25ac8eb9539b81bdebe2aa52c324d70b357
diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index 2ca7351..3acbb55 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -685,18 +685,19 @@ public class utils {
appExecCommand = appExecCommand.replace("\"", "");
appExecCommand = appExecCommand.replace("'", "");
StringTokenizer commandTokens = new StringTokenizer(appExecCommand, "
\t");
- String officeExecutable = "";
String officeExecCommand = "soffice";
+ StringBuilder sb = new StringBuilder();
// is there a 'soffice' in the command? 2do: eliminate case
sensitivity on windows
int index = -1;
while (commandTokens.hasMoreTokens() && index == -1) {
- officeExecutable += commandTokens.nextToken() + " ";
- index = officeExecutable.indexOf(officeExecCommand);
+ sb.append(commandTokens.nextToken()).append(" ");
+ index = sb.indexOf(officeExecCommand);
}
if (index == -1) {
errorMessage = "Error: Your 'AppExecutionCommand' parameter does
not " +
"contain '" + officeExecCommand + "'.";
} else {
+ String officeExecutable = sb.toString();
// does the directory exist?
officeExecutable = officeExecutable.trim();
String officePath = officeExecutable.substring(0, index);
commit ccdd9f5a3ee239aed4d30ebd219992c49207a3b2
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:33:40 2015 +0000
coverity#1326983 SBSC: String concatenation in loop using + operator
Change-Id: Idefe2159ba5becbb7aaa5f28a422d80e29595708
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
index 6328614..c07c93b 100644
--- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
@@ -298,7 +298,7 @@ public class _XMultiPropertySet extends MultiMethodTest {
//Get the properties being tested
private void getPropsToTest(Property[] properties) {
- String bound = "";
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < properties.length; i++) {
@@ -322,11 +322,13 @@ public class _XMultiPropertySet extends MultiMethodTest {
boolean isVoid = util.utils.isVoid(values[0]);
if ( isWritable && isNotNull && isBound && !isExcluded && !isVoid)
{
- bound+=name+";";
+ sb.append(name + ";");
}
} // endfor
+ String bound = sb.toString();
+
//get a array of bound properties
if (bound.equals("")) bound = "none";
StringTokenizer ST=new StringTokenizer(bound,";");
commit 946421516119aca471ff4f08d66a53b5d3a9d1b9
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:31:56 2015 +0000
coverity#1326984 SBSC: String concatenation in loop using + operator
Change-Id: Ib3eddf6c121c462a09c7db310921f4f619c80b5a
diff --git
a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
index a3008c2..ebc0d98 100644
--- a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
+++ b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
@@ -150,7 +150,7 @@ public class _XValidatableFormComponent extends
MultiMethodTest
//Get the properties being tested
private void getPropsToTest(Property[] properties)
{
- String bound = "";
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < properties.length; i++)
{
@@ -175,7 +175,7 @@ public class _XValidatableFormComponent extends
MultiMethodTest
|| name.equals("Date")
)
{
- bound = (name + ";");
+ sb = new StringBuilder(name + ";");
}
if (
@@ -183,9 +183,11 @@ public class _XValidatableFormComponent extends
MultiMethodTest
&& !name.equals("Enabled")
)
{
- bound += (name + ";");
+ sb.append(name + ";");
}
}
+
+ String bound = sb.toString();
// endfor
//get a array of bound properties
commit 1c925e49a365cec690f3a63a4b8cf89d85621df8
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:26:33 2015 +0000
coverity#1326985 SBSC: String concatenation in loop using + operator
Change-Id: I05d12ace635cc780e59a02d79265ac057cb07c0f
diff --git a/qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java
b/qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java
index b7ce48c..2031ca3 100644
--- a/qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java
+++ b/qadevOOo/tests/java/ifc/frame/_XDocumentTemplates.java
@@ -189,19 +189,19 @@ public class _XDocumentTemplates extends MultiMethodTest {
*/
protected String getContentList(XContent content) {
XResultSet statRes = getStatResultSet(content);
- String ret = "";
+ StringBuilder ret = new StringBuilder();
try {
statRes.first();
XRow row = UnoRuntime.queryInterface(XRow.class, statRes);
while(! statRes.isAfterLast()) {
- ret += "\n " + row.getString(1);
+ ret.append("\n ").append(row.getString(1));
statRes.next();
}
} catch (com.sun.star.sdbc.SQLException e) {
log.println("Exception occurred:" + e);
}
- return ret;
+ return ret.toString();
}
protected XResultSet getStatResultSet(XContent content) {
commit 933b541684203539300f5a10149934c8380f190a
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:15:41 2015 +0000
coverity#1326986 SBSC: String concatenation in loop using + operator
Change-Id: Id41f84e66a3f1b85f5003a7f3aa58c88f74158a7
diff --git a/qadevOOo/tests/java/ifc/i18n/_XCollator.java
b/qadevOOo/tests/java/ifc/i18n/_XCollator.java
index 48a3d7f..a9eece7 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCollator.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCollator.java
@@ -408,12 +408,14 @@ public class _XCollator extends MultiMethodTest {
*/
public String toUnicode(String str) {
char[] chars = str.toCharArray() ;
- String res = "" ;
+ StringBuilder res = new StringBuilder();
for (int i = 0; i < chars.length; i++) {
- if (i != 0) res += "," ;
- res += Integer.toHexString(chars[i]) ;
+ if (i != 0) {
+ res.append(",");
+ }
+ res.append(Integer.toHexString(chars[i]));
}
- return res ;
+ return res.toString();
}
}
commit 90867ff483d511ac966de17a171f8a6204b9d2e6
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:13:50 2015 +0000
coverity#1326987 SBSC: String concatenation in loop using + operator
Change-Id: Ic84808388bf0b606ac0eb82f33b10ccfe334e7dc
diff --git a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
index 730f205..657e4e2 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
@@ -80,19 +80,19 @@ public class _XSortedDynamicResultSetFactory extends
MultiMethodTest {
(XContentIdentifierFactory.class,oUCB) ;
String url =
util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
- String escUrl = "" ;
+ StringBuilder escUrl = new StringBuilder();
// In base URL of a JAR file in content URL all directory
// separators ('/') must be replaced with escape symbol '%2F'.
int idx = url.indexOf("/") ;
int lastIdx = -1 ;
while (idx >= 0) {
- escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
+ escUrl.append(url.substring(lastIdx + 1, idx)).append("%2F");
lastIdx = idx ;
idx = url.indexOf("/", idx + 1) ;
}
- escUrl += url.substring(lastIdx + 1) ;
- String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
+ escUrl.append(url.substring(lastIdx + 1));
+ String cntUrl = "vnd.sun.star.pkg://" + escUrl.toString() + "/" ;
XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
commit ef388007062606100f20d0e5003b637fa498021e
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:07:12 2015 +0000
coverity#1326988 SBSC: String concatenation in loop using + operator
Change-Id: Ic960361b04e76c610a0302ada6a7f606afeae798
diff --git a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
index 9521d7e..682804d 100644
--- a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
+++ b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java
@@ -419,10 +419,11 @@ public class _XURLTransformer extends MultiMethodTest {
url.Complete = expectedCompleteFTP;
log.println("getPresentation('" + expectedCompleteFTP + "', false): ");
// the password must be masqurade with <****>
- String asterisk = "";
+ StringBuilder sb = new StringBuilder();
for (int n = 0 ; n < password.length(); n++){
- asterisk += "*";
+ sb.append("*");
}
+ String asterisk = sb.toString();
asterisk = "<" + asterisk.substring(1,asterisk.length());
asterisk = asterisk.substring(0,asterisk.length()-1) + ">";
commit 18b9a6d3e1401ee7660af7c7cea2b847360cb07c
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 14:03:56 2015 +0000
coverity#1326889 SBSC: String concatenation in loop using + operator
Change-Id: Ie572d3f8aab49de491b54c206de8dda01fc1fcaa
diff --git a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
index 4e8b921..d6e5a51 100644
--- a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
+++ b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
@@ -241,20 +241,20 @@ public class _XDocumentHandler extends MultiMethodTest {
log.println("StartElement Processing XML data ...") ;
for(int i = 0; i < xmlData.length; i++) {
String[] elem = xmlData[i] ;
- String xmlTag = "" ;
if ("start".equals(elem[0])) {
- xmlTag += "<" ;
+ StringBuilder xmlTag = new StringBuilder();
+ xmlTag.append("<");
String tagName = elem[1] ;
- xmlTag += tagName ;
+ xmlTag.append(tagName);
XMLTools.AttributeList attr = new XMLTools.AttributeList()
;
for (int j = 2; j < elem.length; j+=3) {
attr.add(elem[j], elem[j+1], elem[j+2]);
- xmlTag += " " + elem[j] + "(" + elem[j+1] +
- ")=\"" + elem[j+2] + "\"" ;
+ xmlTag.append("
").append(elem[j]).append("(").append(elem[j+1]).append(
+ ")=\"").append(elem[j+2]).append("\"");
}
- xmlTag += ">" ;
+ xmlTag.append(">");
- log.println(xmlTag) ;
+ log.println(xmlTag.toString()) ;
oObj.startElement(tagName, attr) ;
} else
if ("end".equals(elem[0])) {
commit 1d3abcb04397b521a91446ecfd3e46c9c49e0e39
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:59:45 2015 +0000
coverity#1326990 SBSC: String concatenation in loop using + operator
Change-Id: I401d93ac2527409e44f908984632232768b1e4c0
diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
index f54370a..89d57f1 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
@@ -95,19 +95,19 @@ public class CachedContentResultSetFactory extends TestCase
{
XContentIdentifierFactory ciFac =
UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
- String escUrl = "" ;
+ StringBuilder escUrl = new StringBuilder();
// In base URL of a JAR file in content URL all directory
// separators ('/') must be replaced with escape symbol '%2F'.
int idx = url.indexOf("/") ;
int lastIdx = -1 ;
while (idx >= 0) {
- escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
+ escUrl.append(url.substring(lastIdx + 1, idx)).append("%2F");
lastIdx = idx ;
idx = url.indexOf("/", idx + 1) ;
}
- escUrl += url.substring(lastIdx + 1) ;
- String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
+ escUrl.append(url.substring(lastIdx + 1));
+ String cntUrl = "vnd.sun.star.pkg://" + escUrl.toString() + "/" ;
XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
commit 09da6a11b4c8b01028fd1da17d83a5ee1c59b4ad
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:57:36 2015 +0000
coverity#1326991 SBSC: String concatenation in loop using + operator
Change-Id: I0b81716a1bdd2ef91bbc7280c92713afe0fbab18
diff --git
a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
index e4a6a36..9e7a557 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
@@ -93,19 +93,19 @@ public class CachedContentResultSetStubFactory extends
TestCase {
XContentIdentifierFactory ciFac =
UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
- String escUrl = "" ;
+ StringBuilder escUrl = new StringBuilder();
// In base URL of a JAR file in content URL all directory
// separators ('/') must be replaced with escape symbol '%2F'.
int idx = url.indexOf("/") ;
int lastIdx = -1 ;
while (idx >= 0) {
- escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
+ escUrl.append(url.substring(lastIdx + 1, idx)).append("%2F");
lastIdx = idx ;
idx = url.indexOf("/", idx + 1) ;
}
- escUrl += url.substring(lastIdx + 1) ;
- String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
+ escUrl.append(url.substring(lastIdx + 1));
+ String cntUrl = "vnd.sun.star.pkg://" + escUrl.toString() + "/" ;
log.println("Getting Content of '" + cntUrl + "'") ;
XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
commit e3ac546730bc5748427f8dbca443662c63545cd9
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:54:53 2015 +0000
coverity#1326992 SBSC: String concatenation in loop using + operator
Change-Id: Ia36048489c3e8ac131c7e20701f5b18270156c2a
diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
index d2435b9..87d13d6 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
@@ -93,19 +93,19 @@ public class CachedDynamicResultSetFactory extends TestCase
{
XContentIdentifierFactory ciFac =
UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
- String escUrl = "" ;
+ StringBuilder escUrl = new StringBuilder();
// In base URL of a JAR file in content URL all directory
// separators ('/') must be replaced with escape symbol '%2F'.
int idx = url.indexOf("/") ;
int lastIdx = -1 ;
while (idx >= 0) {
- escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
+ escUrl.append(url.substring(lastIdx + 1, idx)).append("%2F");
lastIdx = idx ;
idx = url.indexOf("/", idx + 1) ;
}
- escUrl += url.substring(lastIdx + 1) ;
- String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
+ escUrl.append(url.substring(lastIdx + 1));
+ String cntUrl = "vnd.sun.star.pkg://" + escUrl.toString() + "/" ;
XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
commit a99bae57261d6410a6188fbc7ff27486e3ca5923
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:52:41 2015 +0000
coverity#1326993 SBSC: String concatenation in loop using + operator
Change-Id: Ie29933018d22b6a936a429b2fd38b05b3959d8e9
diff --git
a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
index a0245b7..5249b8e 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
@@ -90,19 +90,19 @@ public class CachedDynamicResultSetStubFactory extends
TestCase {
XContentIdentifierFactory ciFac =
UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
- String escUrl = "" ;
+ StringBuilder escUrl = new StringBuilder();
// In base URL of a JAR file in content URL all directory
// separators ('/') must be replaced with escape symbol '%2F'.
int idx = url.indexOf("/") ;
int lastIdx = -1 ;
while (idx >= 0) {
- escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
+ escUrl.append(url.substring(lastIdx + 1, idx)).append("%2F");
lastIdx = idx ;
idx = url.indexOf("/", idx + 1) ;
}
- escUrl += url.substring(lastIdx + 1) ;
- String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
+ escUrl.append(url.substring(lastIdx + 1));
+ String cntUrl = "vnd.sun.star.pkg://" + escUrl.toString() + "/" ;
XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
commit 4d4114668e130f60bcecfa50bf0708362f5d4261
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:50:07 2015 +0000
coverity#1326994 SBSC: String concatenation in loop using + operator
Change-Id: I4fdd7388012b8773b59a69589c06d95d5d51f389
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java
b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index 1286c9f..abbc603 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -147,14 +147,15 @@ public class QueryMetaData extends CommandMetaData
ArrayList<String> CommandNames = new ArrayList<String>(1);
for (int i = 0; i < _FieldNames.length; i++)
{
- String CurCommandName = PropertyNames.EMPTY_STRING;
String[] MetaList = JavaTools.ArrayoutofString(_FieldNames[i],
".");
if (MetaList.length > 1)
{
+ StringBuilder sb = new
StringBuilder(PropertyNames.EMPTY_STRING);
for (int a = 0; a < MetaList.length - 1; a++)
{
- CurCommandName += MetaList[a];
+ sb.append(MetaList[a]);
}
+ String CurCommandName = sb.toString();
if (!CommandNames.contains(CurCommandName))
{
CommandNames.add(CurCommandName);
@@ -166,8 +167,6 @@ public class QueryMetaData extends CommandMetaData
return sIncludedCommandNames;
}
-
-
public void initializeFieldTitleSet()
{
try
commit 5640826c0d5abb25681223eee4e632cf581ea160
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:46:41 2015 +0000
coverity#1326995 SBSC: String concatenation in loop using + operator
Change-Id: I3e42e4815c7b03fdb7e9a4a1d260e4abfb7b6318
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 7a99b7d..e6e8c62 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -73,7 +73,7 @@ public class SQLQueryComposer
getFromClause();
String sSelectBaseClause = "SELECT ";
- String sSelectClause = sSelectBaseClause;
+ StringBuilder sb = new StringBuilder(sSelectBaseClause);
for (int i = 0; i < CurDBMetaData.FieldColumns.length; i++)
{
if
(addtoSelectClause(CurDBMetaData.FieldColumns[i].getDisplayFieldName()))
@@ -81,23 +81,24 @@ public class SQLQueryComposer
int iAggregate =
CurDBMetaData.getAggregateIndex(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
if (iAggregate > -1)
{
- sSelectClause +=
CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" +
getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) +
")";
+
sb.append(CurDBMetaData.AggregateFieldNames[iAggregate][1]).append("(").append(getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0])).append(")");
if (_baddAliasFieldNames)
{
- sSelectClause +=
getAliasFieldNameClause(CurDBMetaData.AggregateFieldNames[iAggregate][0]);
+
sb.append(getAliasFieldNameClause(CurDBMetaData.AggregateFieldNames[iAggregate][0]));
}
}
else
{
- sSelectClause +=
getComposedAliasDisplayName(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
+
sb.append(getComposedAliasDisplayName(CurDBMetaData.FieldColumns[i].getDisplayFieldName()));
if (_baddAliasFieldNames)
{
- sSelectClause +=
getAliasFieldNameClause(CurDBMetaData.FieldColumns[i].getDisplayFieldName());
+
sb.append(getAliasFieldNameClause(CurDBMetaData.FieldColumns[i].getDisplayFieldName()));
}
}
- sSelectClause += ", ";
+ sb.append(", ");
}
}
+ String sSelectClause = sb.toString();
// TODO: little bit unhandy version of remove the append 'comma' at
the end
if (sSelectClause.equals(sSelectBaseClause))
{
commit e24683f321a10415d6f2afc870b2ab3fe6150789
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:42:43 2015 +0000
coverity#1326996 SBSC: String concatenation in loop using + operator
Change-Id: Idebeeac2cc680c14230e059761a05bec7e4c6c60
diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java
b/wizards/com/sun/star/wizards/query/QuerySummary.java
index d6bb2f7..9e0b531 100644
--- a/wizards/com/sun/star/wizards/query/QuerySummary.java
+++ b/wizards/com/sun/star/wizards/query/QuerySummary.java
@@ -160,17 +160,17 @@ public class QuerySummary extends QueryMetaData
private String ArrayFieldsToString(int _InitResID, String[] _FieldNames)
{
- String sReturn = oResource.getResText(_InitResID);
+ StringBuilder sReturn = new
StringBuilder(oResource.getResText(_InitResID));
int FieldCount = _FieldNames.length;
for (int i = 0; i < FieldCount; i++)
{
- sReturn +=
this.getFieldColumnByDisplayName(_FieldNames[i]).getFieldTitle();
+
sReturn.append(this.getFieldColumnByDisplayName(_FieldNames[i]).getFieldTitle());
if (i < FieldCount - 1)
{
- sReturn += sSeparator;
+ sReturn.append(sSeparator);
}
}
- return sReturn;
+ return sReturn.toString();
}
private String combinePartString(int _InitResID, String[][] _FieldNames,
int _AlternativeResID, int _BaseStringID, String[] _ReplaceTags)
commit bd0483f62bf09fec33230fb8f4a58dd26fae0b76
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:41:28 2015 +0000
coverity#1326997 SBSC: String concatenation in loop using + operator
Change-Id: I169b20aa5fe9e030f16c323154e2a77a8468aa87
diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java
b/wizards/com/sun/star/wizards/query/QuerySummary.java
index dd5a8ed..d6bb2f7 100644
--- a/wizards/com/sun/star/wizards/query/QuerySummary.java
+++ b/wizards/com/sun/star/wizards/query/QuerySummary.java
@@ -185,7 +185,7 @@ public class QuerySummary extends QueryMetaData
private String ArrayFieldsToString(int _InitResID, String[][] _FieldNames,
int _BaseStringID, String[] _ReplaceTags)
{
String CurString = PropertyNames.EMPTY_STRING;
- String sReturn = oResource.getResText(_InitResID);
+ StringBuilder sReturn = new
StringBuilder(oResource.getResText(_InitResID));
int FieldCount = _FieldNames.length;
if (FieldCount > 0)
{
@@ -213,13 +213,13 @@ public class QuerySummary extends QueryMetaData
CurString = JavaTools.replaceSubString(CurString,
_FieldNames[i][a], _ReplaceTags[a]);
}
}
- sReturn += CurString;
+ sReturn.append(CurString);
if (i < FieldCount - 1)
{
- sReturn += sSeparator;
+ sReturn.append(sSeparator);
}
}
}
- return sReturn;
+ return sReturn.toString();
}
}
commit 371f5e8e9e345acb2a63106f87e055d49665c399
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:38:43 2015 +0000
coverity#1327008 SBSC: String concatenation in loop using + operator
Change-Id: I2e205bd87760740e1b57647a9a3bdd928be09dfd
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 8875c21..29e7740 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -416,14 +416,17 @@ public class TextStyle extends Style implements Cloneable
{
* Dump this {@code Style} as a Comma Separated Value (CSV) line.
*/
public void dumpCSV() {
- String attributes = "";
+ StringBuilder attributes = new StringBuilder();
for (int bitVal = 0x01; bitVal <= 0x20; bitVal = bitVal << 1) {
if ((bitVal & mask) != 0) {
- attributes += toCSV(((bitVal & values) != 0) ? "yes" : "no");
- } else attributes += toCSV(null); // unspecified
+ attributes.append(toCSV(((bitVal & values) != 0) ? "yes" :
"no"));
+ }
+ else {
+ attributes.append(toCSV(null)); // unspecified
+ }
}
System.out.println(toCSV(name) + toCSV(family) + toCSV(parent)
- + toCSV(fontName) + toCSV("" + sizeInPoints) + attributes +
toLastCSV(null));
+ + toCSV(fontName) + toCSV("" + sizeInPoints) + attributes.toString() +
toLastCSV(null));
}
/**
@@ -569,4 +572,4 @@ public class TextStyle extends Style implements Cloneable {
}
return false;
}
-}
\ No newline at end of file
+}
commit 92ce735143de30f4400fd982b26c1df8cfb64d89
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:29:44 2015 +0000
coverity#1327009 SBSC: String concatenation in loop using + operator
Change-Id: I22eddb72ffa63549ce4361ec4e691ba2ba2bff96
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
index d0957a8..a5298df 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
@@ -66,14 +66,12 @@ public class IteratorLCSAlgorithm implements DiffAlgorithm {
*/
private void printDiffTable(int[][] diffTable) {
- String tmpString = "";
-
for (int i = 0; i < diffTable.length; i++) {
+ StringBuilder sb = new StringBuilder();
for (int j = 0; j < diffTable[i].length; j++) {
- tmpString = tmpString + " " + diffTable[i][j] + " ";
+ sb.append(" ").append(diffTable[i][j]).append(" ");
}
- Debug.log(Debug.INFO, tmpString);
- tmpString = "";
+ Debug.log(Debug.INFO, sb.toString());
}
}
commit e03bb7162b355e6d736ad48b2cc2bbbc3e166171
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:24:48 2015 +0000
coverity#1326717 DLS: Dead local store
Change-Id: I3467c9cdd39c8de4d3a10e4bb19c488ae4a6b9f2
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
index 909b6f5..d0957a8 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
@@ -38,11 +38,9 @@ public class IteratorLCSAlgorithm implements DiffAlgorithm {
int orgSeqlen = orgSeq.elementCount();
int modSeqlen = modSeq.elementCount();
- int[][] diffTable;
-
// Diff table is used to keep track which element is the same or not
// in those 2 sequences
- diffTable = createDiffTable(orgSeq, modSeq);
+ int[][] diffTable = createDiffTable(orgSeq, modSeq);
// debug purpose...
if (Debug.isFlagSet(Debug.INFO)) {
@@ -53,17 +51,10 @@ public class IteratorLCSAlgorithm implements DiffAlgorithm {
generateResult(diffTable, orgSeqlen, modSeqlen, diffResult);
- Difference[] diffArray = new Difference[0];
-
// convert the vector to array, it has to do in here as
// generateResult is called recursively
- if (diffResult.size() > 0) {
- diffArray = new Difference[diffResult.size()];
- diffResult.toArray(diffArray);
- }
-
- diffTable = null;
- diffResult = null;
+ Difference[] diffArray = new Difference[diffResult.size()];
+ diffResult.toArray(diffArray);
return diffArray;
}
@@ -218,4 +209,4 @@ public class IteratorLCSAlgorithm implements DiffAlgorithm {
}
}
}
-}
\ No newline at end of file
+}
commit 1876d9a807ee0b3480ab108273930897cc697d88
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 30 13:17:40 2015 +0000
coverity#1346891 Unused value
Change-Id: Id46a93a8dd1baadf062ea4e5aa471d42aa04468d
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 3074fde..6fcd7b5 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1048,7 +1048,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
if( createTempFile && ( 1 == nDocNo || !bCreateSingleFile
))
bNoError = CreateNewTemp(sPath, sAddress, aTempFile,
rMergeDescriptor, pStoreToFilter);
- if( !bCancel )
+ if (!bCancel && bNoError)
{
std::unique_ptr< INetURLObject > aTempFileURL;
if( createTempFile )
@@ -1226,7 +1226,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
FreezeLayouts(pTargetShell, true);
bFreezedLayouts = true;
}
- } while( !bCancel &&
+ } while( !bCancel && bNoError &&
(bSynchronizedDoc && (nStartRow != nEndRow)?
ExistsNextRecord() : ToNextMergeRecord()));
FinishMailMergeFile(xWorkDocSh, pWorkView, pTargetDoc,
pTargetShell, bCreateSingleFile, rMergeDescriptor.nMergeType ==
DBMGR_MERGE_PRINTER,
@@ -1235,10 +1235,12 @@ bool SwDBManager::MergeMailFiles(SwWrtShell*
pSourceShell,
pProgressDlg.disposeAndClear();
// save the single output document
- bNoError = SavePrintDoc(xTargetDocShell, pTargetView,
rMergeDescriptor, aTempFile,
- pStoreToFilter, pStoreToFilterOptions,
- bMergeShell, bCreateSingleFile,
rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER);
-
+ if (bNoError)
+ {
+ bNoError = SavePrintDoc(xTargetDocShell, pTargetView,
rMergeDescriptor, aTempFile,
+ pStoreToFilter,
pStoreToFilterOptions,
+ bMergeShell, bCreateSingleFile,
rMergeDescriptor.nMergeType == DBMGR_MERGE_PRINTER);
+ }
//remove the temporary files
RemoveTmpFiles(aFilesToRemove);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
