diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/doc.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/doc/docbm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docdraw.cxx | 5 | ||||
-rw-r--r-- | sw/source/core/doc/docfld.cxx | 28 | ||||
-rw-r--r-- | sw/source/core/doc/docfmt.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/doc/docnew.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/docnum.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docruby.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/fmtcol.cxx | 7 | ||||
-rw-r--r-- | sw/source/core/doc/number.cxx | 2 |
10 files changed, 20 insertions, 43 deletions
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index a337f57a231f..084289f43496 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1356,13 +1356,10 @@ void SwDoc::CalculatePagesForPrinting( pStPage = (SwPageFrm*)pStPage->GetNext(); } - - // // now that we have identified the valid pages for printing according // to the print settings we need to get the PageRange to use and // use both results to get the actual pages to be printed // (post-it settings need to be taken into account later on!) - // // get PageRange value to use OUString aPageRange; @@ -1802,7 +1799,6 @@ void SwDoc::UpdateDocStat( bool bCompleteAsync ) } } -// Document - info void SwDoc::DocInfoChgd( ) { GetSysFldType( RES_DOCINFOFLD )->UpdateFlds(); @@ -2215,9 +2211,7 @@ bool SwDoc::RemoveInvisibleContent() } } - // // Remove any hidden paragraph (hidden text attribute) - // for( sal_uLong n = GetNodes().Count(); n; ) { SwTxtNode* pTxtNd = GetNodes()[ --n ]->GetTxtNode(); @@ -2355,9 +2349,7 @@ bool SwDoc::HasInvisibleContent() const if( aIter.First( TYPE( SwFmtFld ) ) ) bRet = true; - // // Search for any hidden paragraph (hidden text attribute) - // if( ! bRet ) { for( sal_uLong n = GetNodes().Count(); !bRet && (n > 0); ) diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 7d6f59cc97d5..4454659ba1b7 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -1037,7 +1037,7 @@ IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const { return static_cast< IDocumentMarkAccess* >(mpMarkManager.get()); } -// SaveBookmark +// SaveBookmark methods SaveBookmark::SaveBookmark( bool bSavePos, diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 80cedc9a4a17..a1475951ad37 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -512,12 +512,11 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn, } } +#include <svx/sxenditm.hxx> + // Is also called by the Sw3 Reader, if there was an error when reading the // drawing layer. If it is called by the Sw3 Reader the layer is rebuilt // from scratch. - -#include <svx/sxenditm.hxx> - void SwDoc::InitDrawModel() { RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDoc::InitDrawModel" ); diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index c27319c3b970..48bec3c49a10 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -298,9 +298,7 @@ SwFieldType* SwDoc::GetFldType( sal_uInt16 nResId, const String& rName, return pRet; } -/* - * All have to be re-evaluated. - */ +// All have to be re-evaluated. void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB ) { // Call Modify() for every field type, @@ -2209,18 +2207,18 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode ) delete pFldSortLst; pFldSortLst = new _SetGetExpFlds; - /// consider and unhide sections - /// with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>) - /// notes by OD: - /// eGetMode == GETFLD_CALC in call from methods SwDoc::FldsToCalc - /// eGetMode == GETFLD_EXPAND in call from method SwDoc::FldsToExpand - /// eGetMode == GETFLD_ALL in call from method SwDoc::UpdateExpFlds - /// I figured out that hidden section only have to be shown, - /// if fields have updated (call by SwDoc::UpdateExpFlds) and thus - /// the hide conditions of section have to be updated. - /// For correct updating the hide condition of a section, its position - /// have to be known in order to insert the hide condition as a new - /// expression field into the sorted field list (<pFldSortLst>). + // consider and unhide sections + // with hide condition, only in mode GETFLD_ALL (<eGetMode == GETFLD_ALL>) + // notes by OD: + // eGetMode == GETFLD_CALC in call from methods SwDoc::FldsToCalc + // eGetMode == GETFLD_EXPAND in call from method SwDoc::FldsToExpand + // eGetMode == GETFLD_ALL in call from method SwDoc::UpdateExpFlds + // I figured out that hidden section only have to be shown, + // if fields have updated (call by SwDoc::UpdateExpFlds) and thus + // the hide conditions of section have to be updated. + // For correct updating the hide condition of a section, its position + // have to be known in order to insert the hide condition as a new + // expression field into the sorted field list (<pFldSortLst>). if ( eGetMode == GETFLD_ALL ) // Collect the sections first. Supply sections that are hidden by condition // with frames so that the contained fields are sorted properly. diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 719fb5a200b0..0eeee942ce37 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -1981,8 +1981,7 @@ void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr, rDestArr, pSrcColl->GetNextTxtFmtColl().GetName() ) ); if(pSrcColl->IsAssignedToListLevelOfOutlineStyle()) - pDstColl->AssignToListLevelOfOutlineStyle(pSrcColl->GetAssignedOutlineStyleLevel());//<-end,zhaojianwei - //<-end + pDstColl->AssignToListLevelOfOutlineStyle(pSrcColl->GetAssignedOutlineStyleLevel()); //FEATURE::CONDCOLL if( RES_CONDTXTFMTCOLL == pSrc->Which() ) diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 463037d235a4..ea7c899df91c 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -325,9 +325,7 @@ SwDoc::SwDoc() { RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDoc::SwDoc" ); - // // COMPATIBILITY FLAGS START - // // Note: Any non-hidden compatibility flag should obtain its default // by asking SvtCompatibilityOptions, see below. @@ -346,9 +344,7 @@ SwDoc::SwDoc() mbDoNotJustifyLinesWithManualBreak = !aOptions.IsExpandWordSpace(); - // // COMPATIBILITY FLAGS END - // /* * DefaultFormats and DefaultFormatCollections (FmtColl) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 32cf8e3f8785..13be89d9dec9 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -684,7 +684,7 @@ static sal_uInt16 lcl_FindOutlineNum( const SwNodes& rNds, String& rName ) return nPos; } -// Ad this bullet point: +// Add this bullet point: // A Name can contain a Number and/or the Text. // diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 25b11eec612f..0a5e70356cbc 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star::i18n; * Members in the list: * - String - the orig text * - SwFmtRuby - the ruby attribut - * - * */ sal_uInt16 SwDoc::FillRubyList( const SwPaM& rPam, SwRubyList& rList, sal_uInt16 nMode ) diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index fc71b6609b89..ccf7b2ba5fa6 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -125,7 +125,7 @@ void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SvxLRSpaceItem *pNewLRSpace = 0, *pOldLRSpace = 0; SvxFontHeightItem* aFontSizeArr[3] = {0,0,0}; // #i70223# - const bool bAssignedToListLevelOfOutlineStyle(IsAssignedToListLevelOfOutlineStyle());//#outline level ,zhaojianwei + const bool bAssignedToListLevelOfOutlineStyle(IsAssignedToListLevelOfOutlineStyle()); const SwNumRuleItem* pNewNumRuleItem( 0L ); SwAttrSetChg *pNewChgSet = 0, *pOldChgSet = 0; @@ -618,7 +618,7 @@ void SwConditionTxtFmtColl::SetConditions( const SwFmtCollConditions& rCndClls ) aCondColls.push_back( pNew ); } } -//#outline level, zhaojianwei + void SwTxtFmtColl::SetAttrOutlineLevel( int nLevel) { OSL_ENSURE( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTxtFmtColl: Level Out Of Range" ); @@ -670,8 +670,5 @@ void SwTxtFmtColl::DeleteAssignmentToListLevelOfOutlineStyle() mbAssignedToOutlineStyle = false; ResetFmtAttr(RES_PARATR_OUTLINELEVEL); } -//<-end,zhaojianwei - -//FEATURE::CONDCOLL /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index c85ec4180c0d..e028eb2ac108 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -377,8 +377,6 @@ const SwFmtVertOrient* SwNumFmt::GetGraphicOrientation() const } } - -// handle new parameter <eDefaultNumberFormatPositionAndSpaceMode> SwNumRule::SwNumRule( const String& rNm, const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode, SwNumRuleType eType, |