CWS-TOOLING: integrate CWS os132

2009-07-21 15:24:18 +0200 os  r274201 : #i103696# SwXTextPortion/SwXParagraph excluded
2009-07-15 13:19:17 +0200 os  r274007 : #i103564# typo
2009-07-15 13:09:30 +0200 os  r274005 : #i103564# SwFrames::hasElements
2009-07-15 13:02:16 +0200 os  r274003 : #i103564# SwXBookmark::getPropertySetInfo fixed
2009-06-26 10:11:00 +0200 os  r273395 : CWS-TOOLING: rebase CWS os132 to trunk@272827 (milestone: DEV300:m50)
2009-06-23 08:52:24 +0200 os  r273256 : #i102764# patch: attribute ListBoxes correctly handled in ::Reset()
2009-06-23 08:51:31 +0200 os  r273255 : #i102764# ResetColor() added to remove background color 
2009-06-22 14:57:38 +0200 os  r273233 : #i102619# prevent access to already destroyed shell
2009-06-18 13:26:51 +0200 os  r273112 : #i99508# ::insertTextContent: re-route to ::attach()
2009-06-18 10:59:53 +0200 os  r273107 : #i85405# patch to enable 'Print grid' CheckBox correctly
2009-06-18 10:54:02 +0200 os  r273106 : #i85133# dispose connection in GetColumnFmt to prevent connection locking
2009-06-18 10:24:31 +0200 os  r273104 : #99535# ExportGraphic changed
2009-06-18 10:24:03 +0200 os  r273103 : #99535# ExportGraphic changed
2009-06-18 10:23:11 +0200 os  r273102 : #i102841# redlining mode switches to insert mode (cmc)
2009-06-17 14:05:42 +0200 os  r273070 : #i102111# do not save already saved HTML documents before switching to source veiw
2009-06-17 13:18:20 +0200 os  r273063 : #i101825# set rembered start position at the real start not at the initial start
2009-06-17 08:24:10 +0200 os  r273048 : #99535# no dierect access to the file picker interface
2009-06-16 15:00:12 +0200 os  r273020 : #i99937# notification of user options changes re-introduced
2009-06-15 14:36:03 +0200 os  r272987 : #i98032# unreplaced text in protected areas must not be attributed either
2009-06-15 14:20:26 +0200 os  r272985 : #i98032# replace list has to be initialised
2009-06-04 13:29:02 +0200 os  r272624 : #i97810# set focus into column page
2009-06-04 11:01:14 +0200 os  r272617 : #i98164# dialog resize to ease localisation
2009-06-04 10:59:44 +0200 os  r272616 : #i98164# dialog resize to ease localisation
2009-05-28 16:05:03 +0200 os  r272413 : #i98172# ConvertFieldsToText: take care of tabs with attributes
2009-05-28 11:12:45 +0200 os  r272385 : #i59361# dialog controls resized
2009-05-28 11:03:14 +0200 os  r272383 : #i59174# dialog controls moved

1 files changed, 4 insertions, 7 deletions

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 64aa1a7d9d26..190cc47dc2f6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -765,6 +765,8 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
         sal_Bool bFailure = sal_False;
         const SfxPoolItem* pItem = NULL;
         SfxShell* pShell( 0 );
+        // #i102619# Retrieve metric from shell before execution - the shell could be destroyed after execution
+        SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM );
         if ( pDispatcher->GetBindings() )
         {
             if ( !pDispatcher->IsLocked( GetId() ) )
@@ -783,6 +785,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
                         lNewArgs[nIndex].Value  = makeAny( SfxDispatchController_Impl::getSlaveCommand( aDispatchURL ));
                     }
 
+                    eMapUnit = GetCoreMetric( pShell->GetPool(), GetId() );
                     SfxAllItemSet aSet( pShell->GetPool() );
                     TransformParameters( GetId(), lNewArgs, aSet, pSlot );
                     if ( aSet.Count() )
@@ -811,6 +814,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
         }
         else
         {
+            eMapUnit = GetCoreMetric( SFX_APP()->GetPool(), GetId() );
             // AppDispatcher
             SfxAllItemSet aSet( SFX_APP()->GetPool() );
             TransformParameters( GetId(), lNewArgs, aSet );
@@ -850,13 +854,6 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             aEvent.Source = (::com::sun::star::frame::XDispatch*) pDispatch;
             if ( bSuccess && pItem && !pItem->ISA(SfxVoidItem) )
             {
-                // Retrieve metric from pool to have correct sub ID when calling QueryValue
-                SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM );
-                if ( pShell )
-                    eMapUnit = GetCoreMetric( pShell->GetPool(), GetId() );
-                else
-                    eMapUnit = GetCoreMetric( SFX_APP()->GetPool(), GetId() );
-
                 USHORT nSubId( 0 );
                 if ( eMapUnit == SFX_MAPUNIT_TWIP )
                     nSubId |= CONVERT_TWIPS;