[ooo-build-commit] Branch 'ooo/OOO310' - wizards/com

[Jan Holesovsky]

 wizards/com/sun/star/wizards/common/FileAccess.java |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e7bf4ad17466a2daa50d7e784ba1ca485c65d85e
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Jul 8 13:33:39 2009 +0000

    CWS-TOOLING: integrate CWS dba311a
    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

diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index 06e8d94..0415207 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -414,7 +414,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);
@@ -426,6 +426,7 @@ public class FileAccess
             else
             {
                 _aFirstPath.remove(i);
+                --i;
             }
         }
     }