INTEGRATION: CWS sfxcleanup (1.188.34); FILE MERGED

2006/04/28 13:42:53 mba 1.188.34.3: RESYNC: (1.189-1.190); FILE MERGED
2006/03/24 13:23:05 mba 1.188.34.2: RESYNC: (1.188-1.189); FILE MERGED
2006/02/27 15:17:26 mba 1.188.34.1: #132394#: remove superfluous code

1 files changed, 12 insertions, 12 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6189cbf062..39ae767c18 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: app.cxx,v $
  *
- *  $Revision: 1.190 $
+ *  $Revision: 1.191 $
  *
- *  last change: $Author: obo $ $Date: 2006-03-24 13:51:32 $
+ *  last change: $Author: rt $ $Date: 2006-05-02 17:12:48 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -178,7 +178,7 @@
 #ifndef _COM_SUN_STAR_FRAME_XUICONTROLLERREGISTRATION_HPP_
 #include <com/sun/star/frame/XUIControllerRegistration.hpp>
 #endif
- 
+
 #include <com/sun/star/java/XJavaVM.hpp>
 
 #ifndef _TOOLS_TESTTOOLLOADER_HXX_
@@ -605,7 +605,7 @@ void Desktop::Init()
 {
     RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" );
     SetBootstrapStatus(BS_OK);
-    
+
     // create service factory...
     Reference < XMultiServiceFactory > rSMgr = CreateApplicationServiceManager();
     if( rSMgr.is() )
@@ -1121,9 +1121,9 @@ void Desktop::retrieveCrashReporterState()
     static const ::rtl::OUString CFG_PACKAGE_RECOVERY   = ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery/");
     static const ::rtl::OUString CFG_PATH_CRASHREPORTER = ::rtl::OUString::createFromAscii("CrashReporter"                  );
     static const ::rtl::OUString CFG_ENTRY_ENABLED      = ::rtl::OUString::createFromAscii("Enabled"                                   );
-    
+
     css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
-    
+
     sal_Bool bEnabled( sal_True );
     if ( xSMGR.is() )
     {
@@ -1174,7 +1174,7 @@ void impl_checkRecoveryState(sal_Bool& bCrashed           ,
     static const ::rtl::OUString PROP_EXISTSSESSION       = ::rtl::OUString::createFromAscii("ExistsSessionData"              );
     static const ::rtl::OUString CFG_PACKAGE_RECOVERY     = ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery/");
     static const ::rtl::OUString CFG_PATH_RECOVERYINFO    = ::rtl::OUString::createFromAscii("RecoveryInfo"                   );
-    
+
     bCrashed            = sal_False;
     bRecoveryDataExists = sal_False;
     bSessionDataExists  = sal_False;
@@ -1188,7 +1188,7 @@ void impl_checkRecoveryState(sal_Bool& bCrashed           ,
 
         xRecovery->getPropertyValue(PROP_CRASHED       ) >>= bCrashed           ;
         xRecovery->getPropertyValue(PROP_EXISTSRECOVERY) >>= bRecoveryDataExists;
-        xRecovery->getPropertyValue(PROP_EXISTSSESSION ) >>= bSessionDataExists ;        
+        xRecovery->getPropertyValue(PROP_EXISTSSESSION ) >>= bSessionDataExists ;
     }
     catch(const css::uno::Exception&) {}
 }
@@ -1230,7 +1230,7 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave     ,
         if (bCrashed && Desktop::isCrashReporterEnabled() )
             aURL.Complete = COMMAND_CRASHREPORT;
     }
-    
+
     sal_Bool bRet = sal_False;
     if ( aURL.Complete.getLength() > 0 )
     {
@@ -1385,7 +1385,7 @@ void Desktop::Main()
         HandleBootstrapErrors( eError );
         return;
     }
-    
+
     BootstrapStatus eStatus = GetBootstrapStatus();
     if (eStatus == BS_TERMINATE) {
         return;
@@ -1403,7 +1403,7 @@ void Desktop::Main()
         aConfigErrHandler.activate();
 
     ResMgr::SetReadStringHook( ReplaceStringHookProc );
-    
+
     // Startup screen
     RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main { OpenSplashScreen" );
     OpenSplashScreen();
@@ -1598,7 +1598,7 @@ void Desktop::Main()
         }
 
         SetSplashScreenProgress(50);
-        
+
         // Backing Component
         sal_Bool bCrashed            = sal_False;
         sal_Bool bExistsRecoveryData = sal_False;