[Libreoffice-commits] core.git: sd/source

[Julien Nabet]

 sd/source/ui/docshell/docshel4.cxx |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 3906f303716a5fe8b0ed34eb4e756243b0af25a2
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Aug 23 07:32:02 2013 +0200

    cppcheck: fix reassigned value + fix indentation
    
    Change-Id: I92ce0ce983b87528860fd56714e29338483b62ca

diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index d3ee527..053b9a6 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -243,9 +243,7 @@ void DrawDocShell::UpdateRefDevice()
  */
 sal_Bool DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
 {
-    sal_Bool bRet = sal_False;
-
-    bRet = SfxObjectShell::InitNew( xStorage );
+    sal_Bool bRet = SfxObjectShell::InitNew( xStorage );
 
     Rectangle aVisArea( Point(0, 0), Size(14100, 10000) );
     SetVisArea(aVisArea);
@@ -350,15 +348,13 @@ sal_Bool DrawDocShell::LoadFrom( SfxMedium& rMedium )
     if( mpViewShell )
         pWait = new WaitObject( (Window*) mpViewShell->GetActiveWindow() );
 
-    sal_Bool bRet = sal_False;
-
-        mpDoc->NewOrLoadCompleted( NEW_DOC );
-        mpDoc->CreateFirstPages();
-        mpDoc->StopWorkStartupDelay();
+    mpDoc->NewOrLoadCompleted( NEW_DOC );
+    mpDoc->CreateFirstPages();
+    mpDoc->StopWorkStartupDelay();
 
-        // TODO/LATER: nobody is interested in the error code?!
-        ErrCode nError = ERRCODE_NONE;
-        bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Organizer, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError );
+    // TODO/LATER: nobody is interested in the error code?!
+    ErrCode nError = ERRCODE_NONE;
+    sal_Bool bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Organizer, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError );
 
 
     // tell SFX to change viewshell when in preview mode