summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-07-16 10:46:51 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-07-16 10:46:51 +0000
commita7b1047c36603fdd222a65b337c38253db54fbd3 (patch)
treee825d884a40686ecbe8c69af0f40f43799d5a2ad
parent70575a0a14ca30459f35e9e741324814331a631c (diff)
CWS-TOOLING: integrate CWS dba311a_DEV300
2009-07-03 13:24:10 +0200 msc r273691 : #i100000# 2009-06-24 11:31:54 +0200 fs r273323 : line ends 2009-06-24 11:30:25 +0200 fs r273322 : line ends 2009-06-09 07:29:25 +0200 oj r272747 : #i102557# default 2nd table 2009-06-08 15:59:51 +0200 fs r272737 : #i102089# PrintOrPreviewContact: do not create a Primitive2DSequence for non-printable controls 2009-06-05 11:22:36 +0200 fs r272673 : #i102090# do not 'paint' controls which are in alive mode, and manually switched to invisible 2009-06-02 11:44:34 +0200 oj r272490 : #i102409# correct deletion in array list
-rw-r--r--wizards/com/sun/star/wizards/common/FileAccess.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index 25dadf1643d3..2043d5b932c3 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -419,7 +419,7 @@ public class FileAccess
**/
public static void combinePaths(XMultiServiceFactory xMSF, ArrayList _aFirstPath, String _sSecondPath) throws NoValidPathException
{
- for (int i = 0; i < _aFirstPath.size(); i++)
+ for (int i = 0; i < _aFirstPath.size(); ++i)
{
String sOnePath = (String) _aFirstPath.get(i);
sOnePath = addPath(sOnePath, _sSecondPath);
@@ -431,6 +431,7 @@ public class FileAccess
else
{
_aFirstPath.remove(i);
+ --i;
}
}
}