From ed51d512d7cff61d1507d50754bc4a7226f48d34 Mon Sep 17 00:00:00 2001
From: Mindaugas Kavaliauskas <dbtopas@dbtopas.lt>
Date: Fri, 27 Nov 2009 03:31:20 +0000
Subject: [PATCH] 2009-11-27 05:31 UTC+0200 Mindaugas Kavaliauskas
 (dbtopas/at/dbtopas.lt)   * harbour/contrib/hbwin/olecore.c     * more
 beautiful and speed optimized version of last commit

---
 harbour/ChangeLog               |  4 ++++
 harbour/contrib/hbwin/olecore.c | 23 ++++++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ca858c756b..bfdfc772e7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-27 05:31 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
+  * harbour/contrib/hbwin/olecore.c
+    * more beautiful and speed optimized version of last commit
+
 2009-11-27 05:21 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/contrib/hbwin/olecore.c
     ! added missing VARIANT initialization
diff --git a/harbour/contrib/hbwin/olecore.c b/harbour/contrib/hbwin/olecore.c
index bc6e59c076..b50187572c 100644
--- a/harbour/contrib/hbwin/olecore.c
+++ b/harbour/contrib/hbwin/olecore.c
@@ -511,27 +511,32 @@ static void hb_oleSafeArrayToItem( PHB_ITEM pItem, SAFEARRAY * pSafeArray, int i
    SafeArrayGetLBound( pSafeArray, iDim, &lFrom );
    SafeArrayGetUBound( pSafeArray, iDim, &lTo );
 
-   if( --iDim == 0 )
-      VariantInit( &vItem );
-
    if( lFrom <= lTo )
    {
       hb_arrayNew( pItem, lTo - lFrom + 1 );
-      do
+      if( --iDim == 0 )
       {
-         plIndex[ iDim ] = lFrom;
-         if( iDim == 0 )
+         VariantInit( &vItem );
+         do
          {
+            plIndex[ iDim ] = lFrom;
             if( SUCCEEDED( SafeArrayGetElement( pSafeArray, plIndex, &vItem ) ) )
             {
                hb_oleVariantToItem( hb_arrayGetItemPtr( pItem, ++ul ), &vItem );
                VariantClear( &vItem );
             }
          }
-         else
-            hb_oleSafeArrayToItem( hb_arrayGetItemPtr( pItem, ++ul ), pSafeArray, iDim, plIndex );
+         while( ++lFrom <= lTo );
+      }
+      else
+      {
+         do
+         {
+            plIndex[ iDim ] = lFrom;
+            hb_oleSafeArrayToItem( hb_arrayGetItemPtr( pItem, ++ul ), pSafeArray, iDim, plIndex );
+         }
+         while( ++lFrom <= lTo );
       }
-      while( ++lFrom <= lTo );
    }
    else
       hb_arrayNew( pItem, 0 );