diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-01-04 11:57:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-01-04 11:57:01 +0000 |
| commit | b0d84fcdade901686eb4b87eccb35cfac136155e (patch) | |
| tree | dbf3dfe67c695b4723cdcb07f68a62efb9475bc1 | |
| parent | 30e66ea6c827d7eb7b93c4edef77ea674da646f2 (diff) | |
INTEGRATION: CWS adc21 (1.2.6); FILE MERGED
2007/11/26 16:45:09 np 1.2.6.2: #i83969#
2007/11/26 12:32:12 np 1.2.6.1: #i83891#
| -rw-r--r-- | autodoc/source/ary/idl/i2s_calculator.cxx | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/autodoc/source/ary/idl/i2s_calculator.cxx b/autodoc/source/ary/idl/i2s_calculator.cxx index 561bafde1d27..25ba9b8c96d1 100644 --- a/autodoc/source/ary/idl/i2s_calculator.cxx +++ b/autodoc/source/ary/idl/i2s_calculator.cxx @@ -4,9 +4,9 @@ * * $RCSfile: i2s_calculator.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2007-11-02 15:42:24 $ + * last change: $Author: hr $ $Date: 2008-01-04 12:57:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -198,9 +198,12 @@ SecondariesCalculator::CheckAllInterfaceBases() interface_iterator itEnd( my_CeStorage().End() ); for ( interface_iterator it( my_CeStorage().BeginUnreserved() ); - it != itEnd AND it.IsValid(); + it != itEnd; ++it ) { + if (NOT it.IsValid()) + continue; + Interface & rInterface = *it; if ( NOT rInterface.HasBase() // According to UNO IDL syntax, an interface without base has com::sun::star::uno::XInterface as base. @@ -216,9 +219,12 @@ SecondariesCalculator::Connect_Types2Ces() { explicittype_iterator itEnd( my_TypeStorage().End() ); for ( explicittype_iterator it( my_TypeStorage().BeginUnreserved() ); - it != itEnd AND it.IsValid(); + it != itEnd; ++it ) { + if (NOT it.IsValid()) + continue; + ExplicitType & rType = ary_cast<ExplicitType>(*it); Ce_id @@ -578,9 +584,12 @@ SecondariesCalculator::gather_Synonyms() cstrg = my_CeStorage(); typedef_citerator itEnd(cstrg.End()); for ( typedef_citerator it(cstrg.Begin()); - it != itEnd AND it.IsValid(); + it != itEnd; ++it ) { + if (NOT it.IsValid()) + continue; + const Typedef & rTypedef = *it; recursive_AssignAsSynonym(rTypedef.CeId(), rTypedef); @@ -975,10 +984,13 @@ SecondariesCalculator::Read_Links2DevManual( csv::bstream & i_file ) { eCurMode = link2ref; } - else if (static_cast<UINT8>(*rLine.c_str()) >= cMaxASCIINumWhiteSpace) + else if (static_cast<UINT8>(*rLine.c_str()) > cMaxASCIINumWhiteSpace) { assign_CurLink(rLine.begin(), sCurLink, sCurLinkUI, eCurMode == link2descr, lineCount); } + // else + // Ignore empty line. + } // end while } |