diff options
Diffstat (limited to 'sw/source/core/doc/docglbl.cxx')
| -rw-r--r-- | sw/source/core/doc/docglbl.cxx | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx index 26d9c75e2140..b72e5ded4689 100644 --- a/sw/source/core/doc/docglbl.cxx +++ b/sw/source/core/doc/docglbl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,24 +88,6 @@ sal_Bool SwDoc::GenerateHTMLDoc( const String& rPath, int nOutlineLevel ) sal_Bool SwDoc::GenerateHTMLDoc( const String& rPath, const SwTxtFmtColl* pSplitColl ) { -#ifdef JP_TEST - if( !pSplitColl ) - { - sal_uInt8 nLvl = 1; - const SwTxtFmtColls& rFmtColls =*GetTxtFmtColls(); - for( sal_uInt16 n = rFmtColls.Count(); n; ) - //if( nLvl == rFmtColls[ --n ]->GetOutlineLevel() )//#outline level,zhaojianwei - if( nLvl == rFmtColls[ --n ]->GetAttrOutlineLevel() -1 )//<-end,zhaojianwei 0814 - { - pSplitColl = rFmtColls[ n ]; - break; - } - - if( !pSplitColl ) - pSplitColl = GetTxtCollFromPool( RES_POOLCOLL_HEADLINE2 ); - } -#endif - return SplitDoc( SPLITDOC_TO_HTML, rPath, pSplitColl ); } @@ -129,7 +112,6 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, { // wenn keine OutlineNumerierung ist, dann benutze eigenes Array // und sammel die Nodes zusammen. - //if( NO_NUMBERING == pSplitColl->GetOutlineLevel() )//#outline level,zhaojianwei if( pSplitColl->GetAttrOutlineLevel() == 0 )//<-end,zhaojianwei, 0814 { pOutlNds = new SwOutlineNodes( 8, 8 ); @@ -150,7 +132,6 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, // dann suche die Gliederungs - Vorlage, der 1. Ebene const SwTxtFmtColls& rFmtColls =*GetTxtFmtColls(); for( sal_uInt16 n = rFmtColls.Count(); n; ) - //if( !rFmtColls[ --n ]->GetOutlineLevel() )//#outline level,zhaojianwei if ( rFmtColls[ --n ]->GetAttrOutlineLevel() == 1 )//<-end,zhaojianwei { pSplitColl = rFmtColls[ n ]; @@ -170,7 +151,6 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, break; default: -// case SPLITDOC_TO_GLOBALDOC: pFilter = SwIoSystem::GetFilterOfFormat( String::CreateFromAscii( FILTER_XML )); eDocType = SPLITDOC_TO_GLOBALDOC; @@ -230,11 +210,6 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, pNd = pOutlNds->GetObject( nOutl ); SwTxtFmtColl* pTColl = pNd->GetTxtNode()->GetTxtColl(); - //if( ( pTColl == pSplitColl || //#outline level,zhaojianwei - // ( NO_NUMBERING != pSplitColl->GetOutlineLevel() && - // pTColl->GetOutlineLevel() < - // pSplitColl->GetOutlineLevel() )) && - // !pNd->FindTableNode() ) if( ( pTColl == pSplitColl || ( pSplitColl->GetAttrOutlineLevel() > 0 && pTColl->GetAttrOutlineLevel() > 0 && @@ -357,7 +332,7 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, aTmp.Exchange(); if( !aTmp.Move( fnMoveBackward, fnGoNode )) { - ASSERT( sal_False, "kein Node mehr vorhanden" ); + OSL_FAIL( "kein Node mehr vorhanden" ); } } // Bookmarks usw. verschieben @@ -475,7 +450,6 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, } } while( pSttNd ); -// if( pOutlNds != (SwOutlineNodes*)&GetNodes().GetOutLineNds(); if( pOutlNds != &GetNodes().GetOutLineNds() ) delete pOutlNds; @@ -493,7 +467,6 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, } break; -// case SPLITDOC_TO_GLOBALDOC: default: // dann das Globaldoc speichern set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true); @@ -531,7 +504,6 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutline break; default: -// case SPLITDOC_TO_GLOBALDOC: pFilter = SwIoSystem::GetFilterOfFormat( String::CreateFromAscii( FILTER_XML )); eDocType = SPLITDOC_TO_GLOBALDOC; @@ -669,7 +641,6 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutline if( SPLITDOC_TO_HTML == eDocType && pDoc->GetSpzFrmFmts()->Count() ) { - /* SfxViewFrame* pFrame = */ SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 ); } xDocSh->DoSaveAs( *pTmpMed ); @@ -708,7 +679,7 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutline aTmp.Exchange(); if( !aTmp.Move( fnMoveBackward, fnGoNode )) { - ASSERT( sal_False, "kein Node mehr vorhanden" ); + OSL_FAIL( "kein Node mehr vorhanden" ); } } // Bookmarks usw. verschieben @@ -853,3 +824,4 @@ sal_Bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, int nOutline return pRet && pRet->GetValue(); }//<-end,zhaojianwei +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |