1 files changed, 14 insertions, 9 deletions

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 450da3e9eebc..fc109add1382 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -351,7 +351,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                     RID_SVXDLG_CUSTOMIZE,
                     NULL, &aSet, xFrame );
 
-                  if ( pDlg )
+                if ( pDlg )
                 {
                     const short nRet = pDlg->Execute();
 
@@ -528,13 +528,13 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
         case SID_ABOUT:
         {
-             SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+            SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
             if ( pFact )
             {
                 VclAbstractDialog* pDlg = pFact->CreateVclDialog( 0, RID_DEFAULTABOUT );
                 pDlg->Execute();
                 delete pDlg;
-            bDone = true;
+                bDone = true;
             }
             break;
         }
@@ -1002,7 +1002,7 @@ static ::rtl::OUString getConfigurationStringValue(
     try
     {
         ::comphelper::ConfigurationHelper::readDirectKey(
-            comphelper::getProcessServiceFactory(),
+            comphelper::getProcessComponentContext(),
             rPackage,
             rRelPath,
             rKey,
@@ -1039,8 +1039,8 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             {
                 VclAbstractDialog* pDlg =
                     pFact->CreateFrameDialog( NULL, xFrame, rReq.GetSlot(), sPageURL );
-                  short nRet = pDlg->Execute();
-                  delete pDlg;
+                short nRet = pDlg->Execute();
+                delete pDlg;
                 SfxViewFrame* pView = SfxViewFrame::GetFirst();
                 while ( pView )
                 {
@@ -1232,7 +1232,10 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 
                 short nDialogResult = pDlg->Execute();
                 if ( !nDialogResult )
+                {
+                    delete pDlg;
                     break;
+                }
 
                 Sequence< Any > args;
                 Sequence< sal_Int16 > outIndex;
@@ -1250,6 +1253,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                     xScriptContext = xController;
 
                 SfxObjectShell::CallXScript( xScriptContext, pDlg->GetScriptURL(), args, ret, outIndex, outArgs );
+                delete pDlg;
             }
             while ( false );
             rReq.Done();
@@ -1275,6 +1279,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             if( pDlg )
             {
                 pDlg->Execute();
+                delete pDlg;
             }
             else
             {
@@ -1315,9 +1320,9 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 if ( pSet && pSet->GetItemState( pSetPool->GetWhich( SID_AUTO_CORRECT_DLG ), sal_False, &pItem ) == SFX_ITEM_SET )
                     aSet.Put( *pItem );
 
-                  SfxAbstractTabDialog* pDlg = pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL );
-                  pDlg->Execute();
-                  delete pDlg;
+                SfxAbstractTabDialog* pDlg = pFact->CreateTabDialog( RID_OFA_AUTOCORR_DLG, NULL, &aSet, NULL );
+                pDlg->Execute();
+                delete pDlg;
             }
 
             break;