diff options
Diffstat (limited to 'sw/source/core/swg/swblocks.cxx')
| -rw-r--r-- | sw/source/core/swg/swblocks.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index 5ac253e82a51..4415c3bae337 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include <shellio.hxx> #include <swblocks.hxx> #include <ndtxt.hxx> -#include <mdiexp.hxx> // Progress +#include <mdiexp.hxx> // Progress #include <SwXMLTextBlocks.hxx> #include <docsh.hxx> #include <swunohelper.hxx> @@ -263,8 +263,8 @@ SwTextBlocks::SwTextBlocks( const String& rFile ) { //case SWBLK_SW2: pImp = new Sw2TextBlocks( sFileName ); break; //case SWBLK_SW3: pImp = new Sw3TextBlocks( sFileName ); break; - case SWBLK_XML: pImp = new SwXMLTextBlocks( sFileName ); break; - case SWBLK_NO_FILE: pImp = new SwXMLTextBlocks( sFileName ); break; + case SWBLK_XML: pImp = new SwXMLTextBlocks( sFileName ); break; + case SWBLK_NO_FILE: pImp = new SwXMLTextBlocks( sFileName ); break; } if( !pImp ) nErr = ERR_SWG_FILE_FORMAT_ERROR; @@ -528,7 +528,7 @@ USHORT SwTextBlocks::Rename( USHORT n, const String* s, const String* l ) if( pImp->IsFileChanged() ) nErr = ERR_TXTBLOCK_NEWFILE_ERROR; - else if( 0 == ( nErr = pImp->OpenFile( FALSE ))) + else if( 0 == ( nErr = pImp->OpenFile( FALSE ))) { // Vorher den neuen Eintrag in die Liste setzen! GetAppCharClass().toUpper( aNew ); @@ -574,12 +574,12 @@ BOOL SwTextBlocks::BeginGetDoc( USHORT n ) { // diese Optimierierung darf es nicht mehr geben. OLE-Objecte muessen auf // ihre SubStorages zugreifem koennen! -// if( n == pImp->nCur ) -// return TRUE; +// if( n == pImp->nCur ) +// return TRUE; if( pImp->IsFileChanged() ) nErr = ERR_TXTBLOCK_NEWFILE_ERROR; - else if( 0 == ( nErr = pImp->OpenFile( TRUE ))) + else if( 0 == ( nErr = pImp->OpenFile( TRUE ))) { pImp->ClearDoc(); nErr = pImp->GetDoc( n ); |