CWS-TOOLING: integrate CWS ooo31gsl2_DEV300

2009-02-18 16:57:37 +0100 hdu  r268244 : #i99367# force logical-width of diacritic glyphs to zero
2009-02-18 14:51:18 +0100 pl  r268224 : #i98525# correct popup menu position on right side in RTL UI
2009-02-18 13:17:20 +0100 pl  r268213 : #i99299# check for NULL ptr
2009-02-18 10:51:48 +0100 pl  r268204 : #i99167# revert change from issue 93173
2009-02-17 16:56:47 +0100 hdu  r268181 : #i99295# src-=debug
2009-02-17 16:43:40 +0100 hdu  r268180 : #i99295# retarget unresolved pLogCluster[n] to a glyph inside the cluster
2009-02-17 16:15:45 +0100 sj  r268178 : #i94831# fixed performance of table import, no longer looping
2009-02-17 13:19:00 +0100 hdu  r268165 : #i97304# reapplied SJ's fix for OOo31
2009-02-17 12:04:53 +0100 hdu  r267989 : #i99241# revert upstream change from icu-trac issue 6249
2009-02-16 18:35:07 +0100 pl  r267832 : #i99166# convolute the already convoluted RTL positioning code some more
2009-02-16 17:25:24 +0100 hdu  r267828 : #i99227# do not export the glyph-flags for the i97326-workaround
2009-02-13 16:26:10 +0100 pl  r267729 : #i98525# remove unused typeinfo header
2009-02-13 16:25:02 +0100 pl  r267728 : #i98525# fix scrolling and native menu issues in RTL UI
2009-02-13 11:18:37 +0100 pl  r267705 : #i98525# merge from CWS vcl99

2 files changed, 11 insertions, 5 deletions

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d4948a90ce..b5c1dd8273 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -336,8 +336,11 @@ void ToolBarManager::Destroy()
             delete static_cast< AddonsParams* >( m_pToolBar->GetItemData( nItemId ));
     }
 
-    // #i93173# delete toolbar lazily as we can still be in one of its handlers
-    m_pToolBar->doLazyDelete();
+    /* #i99167# removed change for i93173 since there is some weird crash
+        // #i93173# delete toolbar lazily as we can still be in one of its handlers
+        m_pToolBar->doLazyDelete();
+    */
+    delete m_pToolBar;
     m_pToolBar = 0;
 }
 
diff --git a/svx/source/svdraw/svdfppt.cxx b/svx/source/svdraw/svdfppt.cxx
index 72ed6b1a3f..c42fb8c990 100644
--- a/svx/source/svdraw/svdfppt.cxx
+++ b/svx/source/svdraw/svdfppt.cxx
@@ -7254,7 +7254,7 @@ void GetLinePositions( const SdrObject* pObj, const std::set< sal_Int32 >& rRows
             nPosition |= aPt1.Y() < aPt2.Y() ? LinePositionBLTR : LinePositionTLBR;
 
         std::set< sal_Int32 >::const_iterator aRow( rRows.find( aPt1.Y() < aPt2.Y() ? aPt1.Y() : aPt2.Y() ) );
-        std::set< sal_Int32 >::const_iterator aColumn( rRows.find( aPt1.X() < aPt2.X() ? aPt1.X() : aPt2.X() ) );
+        std::set< sal_Int32 >::const_iterator aColumn( rColumns.find( aPt1.X() < aPt2.X() ? aPt1.X() : aPt2.X() ) );
         if ( ( aRow != rRows.end() ) && ( aColumn != rColumns.end() ) )
         {
             nPosition |= ( std::distance( rRows.begin(), aRow ) * rColumns.size() ) + std::distance( rColumns.begin(), aColumn );
@@ -7514,7 +7514,7 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
                 }
             }
             ::sdr::table::SdrTableObj* pTable = new ::sdr::table::SdrTableObj( pSdrModel );
-            pTable->SetSnapRect( pGroup->GetSnapRect() );
+            pTable->uno_lock();
             Reference< XTable > xTable( pTable->getTable() );
             try
             {
@@ -7580,11 +7580,14 @@ SdrObject* SdrPowerPointImport::CreateTable( SdrObject* pGroup, sal_uInt32* pTab
                         }
                     }
                 }
-                SdrObject::Free( pGroup );
+                pTable->uno_unlock();
+                pTable->SetSnapRect( pGroup->GetSnapRect() );
                 pRet = pTable;
+                SdrObject::Free( pGroup );
             }
             catch( Exception& )
             {
+                pTable->uno_unlock();
                 SdrObject* pObj = pTable;
                 SdrObject::Free( pObj );
             }