diff options
Diffstat (limited to 'autodoc/source')
484 files changed, 3736 insertions, 3736 deletions
diff --git a/autodoc/source/ary/cpp/c_builtintype.cxx b/autodoc/source/ary/cpp/c_builtintype.cxx index f6168f197856..54ed015da360 100644 --- a/autodoc/source/ary/cpp/c_builtintype.cxx +++ b/autodoc/source/ary/cpp/c_builtintype.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 @@ -52,15 +52,15 @@ Type::inq_RelatedCe() const //********************** BuiltInType **************************// -BuiltInType::BuiltInType( const String & i_sName, - E_TypeSpecialisation i_eSpecialisation ) - : sName( i_sName ), +BuiltInType::BuiltInType( const String & i_sName, + E_TypeSpecialisation i_eSpecialisation ) + : sName( i_sName ), eSpecialisation( i_eSpecialisation ) { } String -BuiltInType::SpecializedName_( const char * i_sName, +BuiltInType::SpecializedName_( const char * i_sName, E_TypeSpecialisation i_eTypeSpecialisation ) { StreamLock @@ -80,7 +80,7 @@ BuiltInType::SpecializedName_( const char * i_sName, default: ; - } // end switch + } // end switch ret << i_sName; return String(ret.c_str()); @@ -112,7 +112,7 @@ BuiltInType::inq_Get_Text( StreamStr & , // o_rPreName { switch (eSpecialisation) { - case TYSP_unsigned: o_rName << "unsigned "; break; + case TYSP_unsigned: o_rName << "unsigned "; break; case TYSP_signed: o_rName << "signed "; break; default: // Does nothing. diff --git a/autodoc/source/ary/cpp/c_class.cxx b/autodoc/source/ary/cpp/c_class.cxx index 33aa04a8c5ac..78c9cc5c60bb 100644 --- a/autodoc/source/ary/cpp/c_class.cxx +++ b/autodoc/source/ary/cpp/c_class.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 diff --git a/autodoc/source/ary/cpp/c_de.cxx b/autodoc/source/ary/cpp/c_de.cxx index 704bc697e239..1d9e9d7b018f 100644 --- a/autodoc/source/ary/cpp/c_de.cxx +++ b/autodoc/source/ary/cpp/c_de.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 diff --git a/autodoc/source/ary/cpp/c_define.cxx b/autodoc/source/ary/cpp/c_define.cxx index 6ea6b8f6a04f..33f3bdbbf257 100644 --- a/autodoc/source/ary/cpp/c_define.cxx +++ b/autodoc/source/ary/cpp/c_define.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 diff --git a/autodoc/source/ary/cpp/c_enum.cxx b/autodoc/source/ary/cpp/c_enum.cxx index e4f8ad15983c..5e2983fed42a 100644 --- a/autodoc/source/ary/cpp/c_enum.cxx +++ b/autodoc/source/ary/cpp/c_enum.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 diff --git a/autodoc/source/ary/cpp/c_enuval.cxx b/autodoc/source/ary/cpp/c_enuval.cxx index 1641689895d4..66017f231fe9 100644 --- a/autodoc/source/ary/cpp/c_enuval.cxx +++ b/autodoc/source/ary/cpp/c_enuval.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 diff --git a/autodoc/source/ary/cpp/c_funct.cxx b/autodoc/source/ary/cpp/c_funct.cxx index 514e294f2bef..73bb4fc2c1dc 100644 --- a/autodoc/source/ary/cpp/c_funct.cxx +++ b/autodoc/source/ary/cpp/c_funct.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 diff --git a/autodoc/source/ary/cpp/c_macro.cxx b/autodoc/source/ary/cpp/c_macro.cxx index 2fad2c0fe5aa..febe4bd7c45d 100644 --- a/autodoc/source/ary/cpp/c_macro.cxx +++ b/autodoc/source/ary/cpp/c_macro.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 diff --git a/autodoc/source/ary/cpp/c_namesp.cxx b/autodoc/source/ary/cpp/c_namesp.cxx index c2574cdbf2a3..205c4ef993ad 100644 --- a/autodoc/source/ary/cpp/c_namesp.cxx +++ b/autodoc/source/ary/cpp/c_namesp.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 diff --git a/autodoc/source/ary/cpp/c_osigna.cxx b/autodoc/source/ary/cpp/c_osigna.cxx index 463c84b1f5f7..ebb5d6a31075 100644 --- a/autodoc/source/ary/cpp/c_osigna.cxx +++ b/autodoc/source/ary/cpp/c_osigna.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 @@ -47,7 +47,7 @@ OperationSignature::OperationSignature( std::vector<Type_id> i_parameterTypes } int -OperationSignature::Compare( const OperationSignature & i_rSig ) const +OperationSignature::Compare( const OperationSignature & i_rSig ) const { if ( aParameterTypes.size() < i_rSig.aParameterTypes.size() ) return -1; diff --git a/autodoc/source/ary/cpp/c_reposypart.cxx b/autodoc/source/ary/cpp/c_reposypart.cxx index 05fb5947e259..f0e989d74f1d 100644 --- a/autodoc/source/ary/cpp/c_reposypart.cxx +++ b/autodoc/source/ary/cpp/c_reposypart.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 @@ -187,7 +187,7 @@ LesserGlobal::operator()( GlobalId i_1, { return i_1.Class() < i_2.Class(); } - + return Ce_GlobalCompare::Lesser_( rCes[i_1.Id()], rCes[i_2.Id()] ); diff --git a/autodoc/source/ary/cpp/c_reposypart.hxx b/autodoc/source/ary/cpp/c_reposypart.hxx index c3b200f1f71b..02d93ccc1c8b 100644 --- a/autodoc/source/ary/cpp/c_reposypart.hxx +++ b/autodoc/source/ary/cpp/c_reposypart.hxx @@ -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 @@ -72,7 +72,7 @@ class RepositoryPartition : public InternalGate RepositoryTitle() const; virtual const CodeEntity * Search_RelatedCe( - Type_id i_type ) const; + Type_id i_type ) const; virtual const ::ary::cpp::CppEntity * Search_Entity( GlobalId i_id ) const; diff --git a/autodoc/source/ary/cpp/c_slots.cxx b/autodoc/source/ary/cpp/c_slots.cxx index e93b25c60d5c..2269a56fe757 100644 --- a/autodoc/source/ary/cpp/c_slots.cxx +++ b/autodoc/source/ary/cpp/c_slots.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 @@ -47,7 +47,7 @@ namespace cpp Slot_SubNamespaces::Slot_SubNamespaces( const Map_NamespacePtr & i_rData ) - : pData( &i_rData ) + : pData( &i_rData ) { } @@ -75,8 +75,8 @@ Slot_SubNamespaces::StoreEntries( ary::Display & o_rDestination ) const //*********************** Slot_BaseClass ********************// -Slot_BaseClass::Slot_BaseClass( const List_Bases & i_rData ) - : pData( &i_rData ) +Slot_BaseClass::Slot_BaseClass( const List_Bases & i_rData ) + : pData( &i_rData ) { } diff --git a/autodoc/source/ary/cpp/c_slots.hxx b/autodoc/source/ary/cpp/c_slots.hxx index dab4f5d4552f..5bc13639874e 100644 --- a/autodoc/source/ary/cpp/c_slots.hxx +++ b/autodoc/source/ary/cpp/c_slots.hxx @@ -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 @@ -49,7 +49,7 @@ class Slot_SubNamespaces : public ary::Slot Slot_SubNamespaces( const Map_NamespacePtr & i_rData ); - virtual ~Slot_SubNamespaces(); + virtual ~Slot_SubNamespaces(); virtual uintt Size() const; @@ -66,7 +66,7 @@ class Slot_BaseClass : public ary::Slot public: Slot_BaseClass( const List_Bases & i_rData ); - virtual ~Slot_BaseClass(); + virtual ~Slot_BaseClass(); virtual uintt Size() const; diff --git a/autodoc/source/ary/cpp/c_traits.cxx b/autodoc/source/ary/cpp/c_traits.cxx index e0bd26a06685..b07a69dd34cc 100644 --- a/autodoc/source/ary/cpp/c_traits.cxx +++ b/autodoc/source/ary/cpp/c_traits.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 diff --git a/autodoc/source/ary/cpp/c_tydef.cxx b/autodoc/source/ary/cpp/c_tydef.cxx index 60f67e7e6c30..f49dcfa9db72 100644 --- a/autodoc/source/ary/cpp/c_tydef.cxx +++ b/autodoc/source/ary/cpp/c_tydef.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 diff --git a/autodoc/source/ary/cpp/c_vari.cxx b/autodoc/source/ary/cpp/c_vari.cxx index 5006748f65c9..736baed2eb52 100644 --- a/autodoc/source/ary/cpp/c_vari.cxx +++ b/autodoc/source/ary/cpp/c_vari.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 diff --git a/autodoc/source/ary/cpp/ca_ce.cxx b/autodoc/source/ary/cpp/ca_ce.cxx index ea49b1446c49..9fdbdd569aca 100644 --- a/autodoc/source/ary/cpp/ca_ce.cxx +++ b/autodoc/source/ary/cpp/ca_ce.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 diff --git a/autodoc/source/ary/cpp/ca_ce.hxx b/autodoc/source/ary/cpp/ca_ce.hxx index 00e722b170c4..dc8b9a08e0fb 100644 --- a/autodoc/source/ary/cpp/ca_ce.hxx +++ b/autodoc/source/ary/cpp/ca_ce.hxx @@ -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 @@ -67,7 +67,7 @@ class CeAdmin : public CePilot io_myReposyPartition ); void Set_Related( const TypePilot & i_types ); - virtual ~CeAdmin(); + virtual ~CeAdmin(); // INQUIRY const Ce_Storage & Storage() const; @@ -125,10 +125,10 @@ class CeAdmin : public CePilot GlobalNamespace() const; virtual const CodeEntity & Find_Ce( - Ce_id i_id ) const; + Ce_id i_id ) const; virtual const CodeEntity * Search_Ce( - Ce_id i_id ) const; + Ce_id i_id ) const; virtual const CodeEntity * Search_CeAbsolute( const CodeEntity & i_curScope, diff --git a/autodoc/source/ary/cpp/ca_def.cxx b/autodoc/source/ary/cpp/ca_def.cxx index 8a2daa8dd9ea..297a8066fdff 100644 --- a/autodoc/source/ary/cpp/ca_def.cxx +++ b/autodoc/source/ary/cpp/ca_def.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 diff --git a/autodoc/source/ary/cpp/ca_def.hxx b/autodoc/source/ary/cpp/ca_def.hxx index 254ad1797b1b..ba1a1f660d7b 100644 --- a/autodoc/source/ary/cpp/ca_def.hxx +++ b/autodoc/source/ary/cpp/ca_def.hxx @@ -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 diff --git a/autodoc/source/ary/cpp/ca_type.cxx b/autodoc/source/ary/cpp/ca_type.cxx index 29117aea7cd0..f9efc7934156 100644 --- a/autodoc/source/ary/cpp/ca_type.cxx +++ b/autodoc/source/ary/cpp/ca_type.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 @@ -66,7 +66,7 @@ TypeAdmin::~TypeAdmin() const Type & TypeAdmin::CheckIn_UsedType( const InputContext & , - DYN UsedType & pass_type ) + DYN UsedType & pass_type ) { Dyn<UsedType> pNewType(&pass_type); // Ensure clean up of heap object. diff --git a/autodoc/source/ary/cpp/ca_type.hxx b/autodoc/source/ary/cpp/ca_type.hxx index 123912d7c389..9758248bc1be 100644 --- a/autodoc/source/ary/cpp/ca_type.hxx +++ b/autodoc/source/ary/cpp/ca_type.hxx @@ -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 @@ -66,7 +66,7 @@ class TypeAdmin : public TypePilot TypeAdmin( RepositoryPartition & io_myReposyPartition ); - virtual ~TypeAdmin(); + virtual ~TypeAdmin(); // INQUIRY /// @return A list of all stored types that are not C++ or STL builtin types. @@ -82,7 +82,7 @@ class TypeAdmin : public TypePilot CheckIn_UsedType( const InputContext & i_context, - DYN UsedType & pass_type ); + DYN UsedType & pass_type ); virtual const Type & Find_Type( Type_id i_type ) const; diff --git a/autodoc/source/ary/cpp/cs_ce.cxx b/autodoc/source/ary/cpp/cs_ce.cxx index 3b4828b67230..9375df4d8377 100644 --- a/autodoc/source/ary/cpp/cs_ce.cxx +++ b/autodoc/source/ary/cpp/cs_ce.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 diff --git a/autodoc/source/ary/cpp/cs_ce.hxx b/autodoc/source/ary/cpp/cs_ce.hxx index a741f0d86c09..5b8e15a46ab9 100644 --- a/autodoc/source/ary/cpp/cs_ce.hxx +++ b/autodoc/source/ary/cpp/cs_ce.hxx @@ -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 diff --git a/autodoc/source/ary/cpp/cs_def.cxx b/autodoc/source/ary/cpp/cs_def.cxx index 713c2aaa63d8..4a8fa424bbef 100644 --- a/autodoc/source/ary/cpp/cs_def.cxx +++ b/autodoc/source/ary/cpp/cs_def.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 diff --git a/autodoc/source/ary/cpp/cs_def.hxx b/autodoc/source/ary/cpp/cs_def.hxx index cfd6b5c61b53..50cf9d18af6b 100644 --- a/autodoc/source/ary/cpp/cs_def.hxx +++ b/autodoc/source/ary/cpp/cs_def.hxx @@ -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 diff --git a/autodoc/source/ary/cpp/cs_type.cxx b/autodoc/source/ary/cpp/cs_type.cxx index a5c6791a7ec2..6e903a44c2fa 100644 --- a/autodoc/source/ary/cpp/cs_type.cxx +++ b/autodoc/source/ary/cpp/cs_type.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 @@ -97,8 +97,8 @@ Type_Storage::Setup_BuiltInTypes() } void -Type_Storage::Set_BuiltInType( Rid i_id, - const char * i_sName, +Type_Storage::Set_BuiltInType( Rid i_id, + const char * i_sName, ary::cpp::E_TypeSpecialisation i_eSpecialisation ) { DYN BuiltInType & diff --git a/autodoc/source/ary/cpp/cs_type.hxx b/autodoc/source/ary/cpp/cs_type.hxx index c1f1568cb097..c903dca68a3e 100644 --- a/autodoc/source/ary/cpp/cs_type.hxx +++ b/autodoc/source/ary/cpp/cs_type.hxx @@ -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 @@ -74,7 +74,7 @@ class Type_Storage : public ::ary::stg::Storage<Type> void Setup_BuiltInTypes(); void Set_BuiltInType( Rid i_nId, - const char * i_sName, + const char * i_sName, ary::cpp::E_TypeSpecialisation i_eSpecialisation = TYSP_none ); // DATA diff --git a/autodoc/source/ary/cpp/namechain.cxx b/autodoc/source/ary/cpp/namechain.cxx index 4df64afe3deb..b581be5e1e18 100644 --- a/autodoc/source/ary/cpp/namechain.cxx +++ b/autodoc/source/ary/cpp/namechain.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 @@ -45,20 +45,20 @@ namespace ut { -//********************* NameSegment ******************// +//********************* NameSegment ******************// NameSegment::NameSegment( const char * i_sName ) - : sName( i_sName ) + : sName( i_sName ) // pTemplate { } NameSegment::NameSegment( const NameSegment & i_rSeg ) - : sName(i_rSeg.sName) + : sName(i_rSeg.sName) // pTemplate { // KORR_FUTURE : Handling of copying of templates. -// csv_assert( NOT i_rSeg.pTemplate ); +// csv_assert( NOT i_rSeg.pTemplate ); } NameSegment& NameSegment::operator=(const NameSegment & i_rSeg) @@ -116,7 +116,7 @@ NameSegment::Get_Text_AsMainType( StreamStr & o_rName, } -//********************* NameChain ******************// +//********************* NameChain ******************// NameChain::NameChain() // : aSegments diff --git a/autodoc/source/ary/cpp/tplparam.cxx b/autodoc/source/ary/cpp/tplparam.cxx index c22fb78e4787..82f53b6e6214 100644 --- a/autodoc/source/ary/cpp/tplparam.cxx +++ b/autodoc/source/ary/cpp/tplparam.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 @@ -52,7 +52,7 @@ TplParameter_Type::~TplParameter_Type() } intt -TplParameter_Type::Compare( const TemplateParameter & i_rOther ) const +TplParameter_Type::Compare( const TemplateParameter & i_rOther ) const { const TplParameter_Type * pOther = dynamic_cast< const TplParameter_Type* >( &i_rOther ); @@ -65,7 +65,7 @@ TplParameter_Type::Compare( const TemplateParameter & i_rOther ) const void TplParameter_Type::Get_Text( StreamStr & o_rOut, - const ary::cpp::Gate & i_rGate ) const + const ary::cpp::Gate & i_rGate ) const { i_rGate.Types().Get_TypeText( o_rOut, nType ); } diff --git a/autodoc/source/ary/cpp/tplparam.hxx b/autodoc/source/ary/cpp/tplparam.hxx index a720eff22776..701a2ad361e3 100644 --- a/autodoc/source/ary/cpp/tplparam.hxx +++ b/autodoc/source/ary/cpp/tplparam.hxx @@ -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 @@ -51,7 +51,7 @@ class TemplateParameter public: virtual ~TemplateParameter() {} - virtual intt Compare( + virtual intt Compare( const TemplateParameter & i_rOther ) const = 0; virtual void Get_Text( @@ -65,10 +65,10 @@ class TplParameter_Type : public TemplateParameter { public: TplParameter_Type( - Tid i_nType ); + Tid i_nType ); ~TplParameter_Type(); - virtual intt Compare( + virtual intt Compare( const TemplateParameter & i_rOther ) const; virtual void Get_Text( @@ -76,7 +76,7 @@ class TplParameter_Type : public TemplateParameter const ary::cpp::Gate & i_rGate ) const; private: - Tid nType; + Tid nType; }; } // namespace ut diff --git a/autodoc/source/ary/cpp/usedtype.cxx b/autodoc/source/ary/cpp/usedtype.cxx index bde91e5b644b..4bc0b0ed7291 100644 --- a/autodoc/source/ary/cpp/usedtype.cxx +++ b/autodoc/source/ary/cpp/usedtype.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 @@ -53,7 +53,7 @@ namespace { using namespace ::ary::cpp; -typedef std::vector< ary::cpp::E_ConVol > PtrLevelVector; +typedef std::vector< ary::cpp::E_ConVol > PtrLevelVector; inline bool @@ -61,26 +61,26 @@ result2bool( intt i_nResult ) { return i_nResult < 0; } -intt compare_PtrLevelVector( +intt compare_PtrLevelVector( const PtrLevelVector & i_r1, const PtrLevelVector & i_r2 ); inline intt -compare_ConVol( E_ConVol i_e1, +compare_ConVol( E_ConVol i_e1, E_ConVol i_e2 ) { return intt(i_e1) - intt(i_e2); } inline intt -compare_bool( bool i_b1, +compare_bool( bool i_b1, bool i_b2 ) { return i_b1 == i_b2 - ? 0 - : i_b1 - ? -1 - : +1; } + ? 0 + : i_b1 + ? -1 + : +1; } inline intt -compare_Specialisation( E_TypeSpecialisation i_e1, +compare_Specialisation( E_TypeSpecialisation i_e1, E_TypeSpecialisation i_e2 ) { return intt(i_e1) - intt(i_e2); } @@ -116,7 +116,7 @@ compare_PtrLevelVector( const PtrLevelVector & i_r1, } -} // anonymous namespace +} // anonymous namespace @@ -549,15 +549,15 @@ List_TplParameter::Get_Text( StreamStr & o_rOut, } intt -List_TplParameter::Compare( const List_TplParameter & i_rOther ) const +List_TplParameter::Compare( const List_TplParameter & i_rOther ) const { intt nResult = intt(aTplParameters.size()) - intt(i_rOther.aTplParameters.size()); if (nResult != 0) return nResult; - Vector_TplArgument::const_iterator it1 = aTplParameters.begin(); - Vector_TplArgument::const_iterator it1End = aTplParameters.end(); + Vector_TplArgument::const_iterator it1 = aTplParameters.begin(); + Vector_TplArgument::const_iterator it1End = aTplParameters.end(); Vector_TplArgument::const_iterator it2 = i_rOther.aTplParameters.begin(); for ( ; it1 != it1End; ++it1, ++it2 ) diff --git a/autodoc/source/ary/doc/d_boolean.cxx b/autodoc/source/ary/doc/d_boolean.cxx index 163f5ef0c8e6..c4ed5e32d9e5 100644 --- a/autodoc/source/ary/doc/d_boolean.cxx +++ b/autodoc/source/ary/doc/d_boolean.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 diff --git a/autodoc/source/ary/doc/d_docu.cxx b/autodoc/source/ary/doc/d_docu.cxx index bcb601e339eb..9ec031d13a0c 100644 --- a/autodoc/source/ary/doc/d_docu.cxx +++ b/autodoc/source/ary/doc/d_docu.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 diff --git a/autodoc/source/ary/doc/d_node.cxx b/autodoc/source/ary/doc/d_node.cxx index 7c2cc3d84c8b..0722ead091d0 100644 --- a/autodoc/source/ary/doc/d_node.cxx +++ b/autodoc/source/ary/doc/d_node.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 diff --git a/autodoc/source/ary/doc/d_oldcppdocu.cxx b/autodoc/source/ary/doc/d_oldcppdocu.cxx index 17d2edcb298a..bcf655dfa2ab 100644 --- a/autodoc/source/ary/doc/d_oldcppdocu.cxx +++ b/autodoc/source/ary/doc/d_oldcppdocu.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 @@ -54,7 +54,7 @@ typedef DYN StdTag * (F_CREATE)(); OldCppDocu::OldCppDocu() - : Node(docnt::nt_OldCppDocu), + : Node(docnt::nt_OldCppDocu), bIsObsolete(false), bIsInternal(false), bIsInterface(false) @@ -307,7 +307,7 @@ OldCppDocu::NewTag(UINT8 i_nIndex) } AtTag & -OldCppDocu::GetTag( UINT8 i_nIndex ) +OldCppDocu::GetTag( UINT8 i_nIndex ) { csv_assert( i_nIndex < C_eAtTag_NrOfClasses ); csv_assert( nTags[i_nIndex] != C_ucNO_INDEX ); diff --git a/autodoc/source/ary/doc/d_oldidldocu.cxx b/autodoc/source/ary/doc/d_oldidldocu.cxx index e1190d9fd364..4fd7086f4d14 100644 --- a/autodoc/source/ary/doc/d_oldidldocu.cxx +++ b/autodoc/source/ary/doc/d_oldidldocu.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 diff --git a/autodoc/source/ary/idl/i2s_calculator.cxx b/autodoc/source/ary/idl/i2s_calculator.cxx index e469ec14fd90..40abb0358667 100644 --- a/autodoc/source/ary/idl/i2s_calculator.cxx +++ b/autodoc/source/ary/idl/i2s_calculator.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 diff --git a/autodoc/source/ary/idl/i2s_calculator.hxx b/autodoc/source/ary/idl/i2s_calculator.hxx index dd85d0a05e21..04c5c21578ae 100644 --- a/autodoc/source/ary/idl/i2s_calculator.hxx +++ b/autodoc/source/ary/idl/i2s_calculator.hxx @@ -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 diff --git a/autodoc/source/ary/idl/i_attribute.cxx b/autodoc/source/ary/idl/i_attribute.cxx index 8dc1d62f8f9f..56370cbf3055 100644 --- a/autodoc/source/ary/idl/i_attribute.cxx +++ b/autodoc/source/ary/idl/i_attribute.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 diff --git a/autodoc/source/ary/idl/i_ce.cxx b/autodoc/source/ary/idl/i_ce.cxx index 3d4503887124..c586d2ea27ff 100644 --- a/autodoc/source/ary/idl/i_ce.cxx +++ b/autodoc/source/ary/idl/i_ce.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 diff --git a/autodoc/source/ary/idl/i_ce2s.cxx b/autodoc/source/ary/idl/i_ce2s.cxx index 9a126fd312e2..89a1bd102b83 100644 --- a/autodoc/source/ary/idl/i_ce2s.cxx +++ b/autodoc/source/ary/idl/i_ce2s.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 diff --git a/autodoc/source/ary/idl/i_comrela.cxx b/autodoc/source/ary/idl/i_comrela.cxx index f76076aa3847..3e3d8beaf19f 100644 --- a/autodoc/source/ary/idl/i_comrela.cxx +++ b/autodoc/source/ary/idl/i_comrela.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 diff --git a/autodoc/source/ary/idl/i_constant.cxx b/autodoc/source/ary/idl/i_constant.cxx index 3a6eb4fbf8cc..e03d829e5bb2 100644 --- a/autodoc/source/ary/idl/i_constant.cxx +++ b/autodoc/source/ary/idl/i_constant.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 diff --git a/autodoc/source/ary/idl/i_constgroup.cxx b/autodoc/source/ary/idl/i_constgroup.cxx index b1955d55e186..7008f94d7dcb 100644 --- a/autodoc/source/ary/idl/i_constgroup.cxx +++ b/autodoc/source/ary/idl/i_constgroup.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 diff --git a/autodoc/source/ary/idl/i_enum.cxx b/autodoc/source/ary/idl/i_enum.cxx index 9d01c2b19ce5..6f0e3920099f 100644 --- a/autodoc/source/ary/idl/i_enum.cxx +++ b/autodoc/source/ary/idl/i_enum.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 diff --git a/autodoc/source/ary/idl/i_enumvalue.cxx b/autodoc/source/ary/idl/i_enumvalue.cxx index fadfe1ce6fdb..5a851271b795 100644 --- a/autodoc/source/ary/idl/i_enumvalue.cxx +++ b/autodoc/source/ary/idl/i_enumvalue.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 diff --git a/autodoc/source/ary/idl/i_exception.cxx b/autodoc/source/ary/idl/i_exception.cxx index f25ae55ce66a..57b60386904c 100644 --- a/autodoc/source/ary/idl/i_exception.cxx +++ b/autodoc/source/ary/idl/i_exception.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 diff --git a/autodoc/source/ary/idl/i_function.cxx b/autodoc/source/ary/idl/i_function.cxx index 4d9375d3451e..f9c00f2bb8b0 100644 --- a/autodoc/source/ary/idl/i_function.cxx +++ b/autodoc/source/ary/idl/i_function.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 @@ -142,7 +142,7 @@ attr::HasEllipse( const CodeEntity & i_ce ) void attr::Get_Parameters( Dyn_StdConstIterator<ary::idl::Parameter> & o_result, - const CodeEntity & i_ce ) + const CodeEntity & i_ce ) { o_result = new SCI_Vector<Parameter>( function_cast(i_ce).aParameters ); diff --git a/autodoc/source/ary/idl/i_interface.cxx b/autodoc/source/ary/idl/i_interface.cxx index 455261e3e5ad..08c80c5eb448 100644 --- a/autodoc/source/ary/idl/i_interface.cxx +++ b/autodoc/source/ary/idl/i_interface.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 diff --git a/autodoc/source/ary/idl/i_module.cxx b/autodoc/source/ary/idl/i_module.cxx index a8459b3ebfdd..fa671f23e99b 100644 --- a/autodoc/source/ary/idl/i_module.cxx +++ b/autodoc/source/ary/idl/i_module.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 diff --git a/autodoc/source/ary/idl/i_namelookup.cxx b/autodoc/source/ary/idl/i_namelookup.cxx index d9fe29b4e2f0..d71884ad3b6e 100644 --- a/autodoc/source/ary/idl/i_namelookup.cxx +++ b/autodoc/source/ary/idl/i_namelookup.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 diff --git a/autodoc/source/ary/idl/i_nnfinder.hxx b/autodoc/source/ary/idl/i_nnfinder.hxx index 242372a0bf70..58ed77a46259 100644 --- a/autodoc/source/ary/idl/i_nnfinder.hxx +++ b/autodoc/source/ary/idl/i_nnfinder.hxx @@ -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 diff --git a/autodoc/source/ary/idl/i_param.cxx b/autodoc/source/ary/idl/i_param.cxx index 106a5427db7b..38a48f0277c9 100644 --- a/autodoc/source/ary/idl/i_param.cxx +++ b/autodoc/source/ary/idl/i_param.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 diff --git a/autodoc/source/ary/idl/i_property.cxx b/autodoc/source/ary/idl/i_property.cxx index 9b13870e98f3..dacc596b4fe4 100644 --- a/autodoc/source/ary/idl/i_property.cxx +++ b/autodoc/source/ary/idl/i_property.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 diff --git a/autodoc/source/ary/idl/i_reposypart.cxx b/autodoc/source/ary/idl/i_reposypart.cxx index 62bb4fee6cf7..d0a3b136375c 100644 --- a/autodoc/source/ary/idl/i_reposypart.cxx +++ b/autodoc/source/ary/idl/i_reposypart.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 diff --git a/autodoc/source/ary/idl/i_reposypart.hxx b/autodoc/source/ary/idl/i_reposypart.hxx index 417d970814bf..65aa243f6ee8 100644 --- a/autodoc/source/ary/idl/i_reposypart.hxx +++ b/autodoc/source/ary/idl/i_reposypart.hxx @@ -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 diff --git a/autodoc/source/ary/idl/i_service.cxx b/autodoc/source/ary/idl/i_service.cxx index 0aa16b9e3280..dde1c8618c42 100644 --- a/autodoc/source/ary/idl/i_service.cxx +++ b/autodoc/source/ary/idl/i_service.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 @@ -131,14 +131,14 @@ service_cast( const CodeEntity & i_ce ) void attr::Get_IncludedServices( Dyn_StdConstIterator<CommentedRelation> & o_result, - const CodeEntity & i_ce ) + const CodeEntity & i_ce ) { o_result = new SCI_Vector<CommentedRelation>( service_cast(i_ce).aIncludedServices ); } void attr::Get_ExportedInterfaces( Dyn_StdConstIterator<CommentedRelation> & o_result, - const CodeEntity & i_ce ) + const CodeEntity & i_ce ) { o_result = new SCI_Vector<CommentedRelation>( service_cast(i_ce).aSupportedInterfaces ); } diff --git a/autodoc/source/ary/idl/i_singleton.cxx b/autodoc/source/ary/idl/i_singleton.cxx index 508572bb2713..10dfb59fffa0 100644 --- a/autodoc/source/ary/idl/i_singleton.cxx +++ b/autodoc/source/ary/idl/i_singleton.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 diff --git a/autodoc/source/ary/idl/i_siservice.cxx b/autodoc/source/ary/idl/i_siservice.cxx index 238e605ce680..320d04eae6bf 100644 --- a/autodoc/source/ary/idl/i_siservice.cxx +++ b/autodoc/source/ary/idl/i_siservice.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 @@ -110,7 +110,7 @@ attr::BaseInterface( const CodeEntity & i_ce ) void attr::Get_Constructors( Dyn_CeIterator & o_result, - const CodeEntity & i_ce ) + const CodeEntity & i_ce ) { o_result = new SCI_Vector<Ce_id>( sglifcservice_cast(i_ce).aConstructors ); } diff --git a/autodoc/source/ary/idl/i_sisingleton.cxx b/autodoc/source/ary/idl/i_sisingleton.cxx index 1cc2b97cd75f..0872a641d2d3 100644 --- a/autodoc/source/ary/idl/i_sisingleton.cxx +++ b/autodoc/source/ary/idl/i_sisingleton.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 diff --git a/autodoc/source/ary/idl/i_struct.cxx b/autodoc/source/ary/idl/i_struct.cxx index ff691c211a89..0f602637a4f4 100644 --- a/autodoc/source/ary/idl/i_struct.cxx +++ b/autodoc/source/ary/idl/i_struct.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 diff --git a/autodoc/source/ary/idl/i_structelem.cxx b/autodoc/source/ary/idl/i_structelem.cxx index 79ffe4189ac0..1b5a89c83327 100644 --- a/autodoc/source/ary/idl/i_structelem.cxx +++ b/autodoc/source/ary/idl/i_structelem.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 diff --git a/autodoc/source/ary/idl/i_traits.cxx b/autodoc/source/ary/idl/i_traits.cxx index 4dc9c2b2c750..610028e0ea8f 100644 --- a/autodoc/source/ary/idl/i_traits.cxx +++ b/autodoc/source/ary/idl/i_traits.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 diff --git a/autodoc/source/ary/idl/i_typedef.cxx b/autodoc/source/ary/idl/i_typedef.cxx index ded4ada0bede..89d20af56333 100644 --- a/autodoc/source/ary/idl/i_typedef.cxx +++ b/autodoc/source/ary/idl/i_typedef.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 diff --git a/autodoc/source/ary/idl/ia_ce.cxx b/autodoc/source/ary/idl/ia_ce.cxx index 5e66838f1ba5..7335df37b92e 100644 --- a/autodoc/source/ary/idl/ia_ce.cxx +++ b/autodoc/source/ary/idl/ia_ce.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 diff --git a/autodoc/source/ary/idl/ia_ce.hxx b/autodoc/source/ary/idl/ia_ce.hxx index aad50cfe05f2..ad31188db48c 100644 --- a/autodoc/source/ary/idl/ia_ce.hxx +++ b/autodoc/source/ary/idl/ia_ce.hxx @@ -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 diff --git a/autodoc/source/ary/idl/ia_type.cxx b/autodoc/source/ary/idl/ia_type.cxx index 4f4b26062bc3..2caa0d77699f 100644 --- a/autodoc/source/ary/idl/ia_type.cxx +++ b/autodoc/source/ary/idl/ia_type.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 diff --git a/autodoc/source/ary/idl/ia_type.hxx b/autodoc/source/ary/idl/ia_type.hxx index ace6a9903815..88cd183690b9 100644 --- a/autodoc/source/ary/idl/ia_type.hxx +++ b/autodoc/source/ary/idl/ia_type.hxx @@ -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 diff --git a/autodoc/source/ary/idl/is_ce.cxx b/autodoc/source/ary/idl/is_ce.cxx index b50b0058fba4..998b4c7271e7 100644 --- a/autodoc/source/ary/idl/is_ce.cxx +++ b/autodoc/source/ary/idl/is_ce.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 diff --git a/autodoc/source/ary/idl/is_ce.hxx b/autodoc/source/ary/idl/is_ce.hxx index 43266086b197..46c24659a85f 100644 --- a/autodoc/source/ary/idl/is_ce.hxx +++ b/autodoc/source/ary/idl/is_ce.hxx @@ -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 diff --git a/autodoc/source/ary/idl/is_type.cxx b/autodoc/source/ary/idl/is_type.cxx index 6082397140de..099360c1fc95 100644 --- a/autodoc/source/ary/idl/is_type.cxx +++ b/autodoc/source/ary/idl/is_type.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 diff --git a/autodoc/source/ary/idl/is_type.hxx b/autodoc/source/ary/idl/is_type.hxx index 14a4da1127c0..540de196b195 100644 --- a/autodoc/source/ary/idl/is_type.hxx +++ b/autodoc/source/ary/idl/is_type.hxx @@ -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 diff --git a/autodoc/source/ary/idl/it_builtin.cxx b/autodoc/source/ary/idl/it_builtin.cxx index cc287b43b389..30a0ce919bf4 100644 --- a/autodoc/source/ary/idl/it_builtin.cxx +++ b/autodoc/source/ary/idl/it_builtin.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 diff --git a/autodoc/source/ary/idl/it_builtin.hxx b/autodoc/source/ary/idl/it_builtin.hxx index 7a68f0a4f1f1..a5447bf1a44c 100644 --- a/autodoc/source/ary/idl/it_builtin.hxx +++ b/autodoc/source/ary/idl/it_builtin.hxx @@ -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 diff --git a/autodoc/source/ary/idl/it_ce.cxx b/autodoc/source/ary/idl/it_ce.cxx index 6aef98066b49..5975028a18de 100644 --- a/autodoc/source/ary/idl/it_ce.cxx +++ b/autodoc/source/ary/idl/it_ce.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 diff --git a/autodoc/source/ary/idl/it_ce.hxx b/autodoc/source/ary/idl/it_ce.hxx index 8693c9df9750..876ae2ca70ea 100644 --- a/autodoc/source/ary/idl/it_ce.hxx +++ b/autodoc/source/ary/idl/it_ce.hxx @@ -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 diff --git a/autodoc/source/ary/idl/it_explicit.cxx b/autodoc/source/ary/idl/it_explicit.cxx index 900556106ae9..ce65208a7e1d 100644 --- a/autodoc/source/ary/idl/it_explicit.cxx +++ b/autodoc/source/ary/idl/it_explicit.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 diff --git a/autodoc/source/ary/idl/it_explicit.hxx b/autodoc/source/ary/idl/it_explicit.hxx index ddda35458173..091cfafb0e2b 100644 --- a/autodoc/source/ary/idl/it_explicit.hxx +++ b/autodoc/source/ary/idl/it_explicit.hxx @@ -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 diff --git a/autodoc/source/ary/idl/it_named.hxx b/autodoc/source/ary/idl/it_named.hxx index 473d27d1139d..cece6c1c52f8 100644 --- a/autodoc/source/ary/idl/it_named.hxx +++ b/autodoc/source/ary/idl/it_named.hxx @@ -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 @@ -53,7 +53,7 @@ class Named_Type : public Type { public: // LIFECYCLE - virtual ~Named_Type() {} + virtual ~Named_Type() {} // INQUIRY const String & Name() const { return sName; } diff --git a/autodoc/source/ary/idl/it_sequence.cxx b/autodoc/source/ary/idl/it_sequence.cxx index daa9c043cfd3..e82087dd01de 100644 --- a/autodoc/source/ary/idl/it_sequence.cxx +++ b/autodoc/source/ary/idl/it_sequence.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 diff --git a/autodoc/source/ary/idl/it_sequence.hxx b/autodoc/source/ary/idl/it_sequence.hxx index 3971861356c1..0947eb68331a 100644 --- a/autodoc/source/ary/idl/it_sequence.hxx +++ b/autodoc/source/ary/idl/it_sequence.hxx @@ -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 diff --git a/autodoc/source/ary/idl/it_tplparam.cxx b/autodoc/source/ary/idl/it_tplparam.cxx index f8a3097e44a0..1ff4c052aa9f 100644 --- a/autodoc/source/ary/idl/it_tplparam.cxx +++ b/autodoc/source/ary/idl/it_tplparam.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 diff --git a/autodoc/source/ary/idl/it_tplparam.hxx b/autodoc/source/ary/idl/it_tplparam.hxx index 294712f32741..8aa116e4a9ca 100644 --- a/autodoc/source/ary/idl/it_tplparam.hxx +++ b/autodoc/source/ary/idl/it_tplparam.hxx @@ -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 diff --git a/autodoc/source/ary/idl/it_xnameroom.cxx b/autodoc/source/ary/idl/it_xnameroom.cxx index 23fbe617ba7f..0a9b06e9a103 100644 --- a/autodoc/source/ary/idl/it_xnameroom.cxx +++ b/autodoc/source/ary/idl/it_xnameroom.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 @@ -82,7 +82,7 @@ ExplicitNameRoom::inq_Get_Text( StringVector & o_module, if ( it != NameChain_End() ? (*it).empty() : false ) - { // Don't put out the root global namespace + { // Don't put out the root global namespace ++it; } diff --git a/autodoc/source/ary/idl/it_xnameroom.hxx b/autodoc/source/ary/idl/it_xnameroom.hxx index cb70e17102ca..ec40304501c3 100644 --- a/autodoc/source/ary/idl/it_xnameroom.hxx +++ b/autodoc/source/ary/idl/it_xnameroom.hxx @@ -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 diff --git a/autodoc/source/ary/inc/cpp_internalgate.hxx b/autodoc/source/ary/inc/cpp_internalgate.hxx index a2d4532c71ed..a81d9f11870b 100644 --- a/autodoc/source/ary/inc/cpp_internalgate.hxx +++ b/autodoc/source/ary/inc/cpp_internalgate.hxx @@ -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 diff --git a/autodoc/source/ary/inc/cross_refs.hxx b/autodoc/source/ary/inc/cross_refs.hxx index ca2e893078f7..53b5c2edb3cf 100644 --- a/autodoc/source/ary/inc/cross_refs.hxx +++ b/autodoc/source/ary/inc/cross_refs.hxx @@ -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 diff --git a/autodoc/source/ary/inc/idl_internalgate.hxx b/autodoc/source/ary/inc/idl_internalgate.hxx index 3f6daff5fa21..41ba4da76cb8 100644 --- a/autodoc/source/ary/inc/idl_internalgate.hxx +++ b/autodoc/source/ary/inc/idl_internalgate.hxx @@ -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 diff --git a/autodoc/source/ary/inc/idsort.hxx b/autodoc/source/ary/inc/idsort.hxx index 72dbbf0c6292..b87572d51d83 100644 --- a/autodoc/source/ary/inc/idsort.hxx +++ b/autodoc/source/ary/inc/idsort.hxx @@ -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 diff --git a/autodoc/source/ary/inc/loc_internalgate.hxx b/autodoc/source/ary/inc/loc_internalgate.hxx index 8e31de688344..a2dc95106f01 100644 --- a/autodoc/source/ary/inc/loc_internalgate.hxx +++ b/autodoc/source/ary/inc/loc_internalgate.hxx @@ -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 diff --git a/autodoc/source/ary/inc/nametreenode.hxx b/autodoc/source/ary/inc/nametreenode.hxx index 1865e886e3f7..7cf73813fa58 100644 --- a/autodoc/source/ary/inc/nametreenode.hxx +++ b/autodoc/source/ary/inc/nametreenode.hxx @@ -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 diff --git a/autodoc/source/ary/inc/reposy.hxx b/autodoc/source/ary/inc/reposy.hxx index 8668d2e47ef3..0d89b50436e3 100644 --- a/autodoc/source/ary/inc/reposy.hxx +++ b/autodoc/source/ary/inc/reposy.hxx @@ -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 diff --git a/autodoc/source/ary/inc/sci_impl.hxx b/autodoc/source/ary/inc/sci_impl.hxx index 491e356c58f9..92aa1512f2d5 100644 --- a/autodoc/source/ary/inc/sci_impl.hxx +++ b/autodoc/source/ary/inc/sci_impl.hxx @@ -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 diff --git a/autodoc/source/ary/inc/slots.hxx b/autodoc/source/ary/inc/slots.hxx index bcba75defda9..94958ce4591a 100644 --- a/autodoc/source/ary/inc/slots.hxx +++ b/autodoc/source/ary/inc/slots.hxx @@ -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 @@ -50,7 +50,7 @@ namespace ary class Slot_Null : public Slot { public: - virtual ~Slot_Null(); + virtual ~Slot_Null(); virtual void StoreAt( Display & o_rDestination ) const; @@ -66,7 +66,7 @@ class Slot_MapLocalCe : public Slot public: Slot_MapLocalCe( const cpp::Map_LocalCe & i_rData ); - virtual ~Slot_MapLocalCe(); + virtual ~Slot_MapLocalCe(); virtual uintt Size() const; private: @@ -83,7 +83,7 @@ class Slot_MapOperations : public Slot Slot_MapOperations( const std::multimap<String, cpp::Ce_id> & i_rData ); - virtual ~Slot_MapOperations(); + virtual ~Slot_MapOperations(); virtual uintt Size() const; private: @@ -100,7 +100,7 @@ class Slot_ListLocalCe : public Slot Slot_ListLocalCe( const cpp::List_LocalCe & i_rData ); - virtual ~Slot_ListLocalCe(); + virtual ~Slot_ListLocalCe(); virtual uintt Size() const; @@ -120,7 +120,7 @@ class Slot_SequentialIds : public Slot const SequentialIds<ID> & i_rData ) : pData(&i_rData) {} - virtual ~Slot_SequentialIds(); + virtual ~Slot_SequentialIds(); virtual uintt Size() const; diff --git a/autodoc/source/ary/inc/sorted_idset.hxx b/autodoc/source/ary/inc/sorted_idset.hxx index c5dff11bcaeb..9db3731fe4ef 100644 --- a/autodoc/source/ary/inc/sorted_idset.hxx +++ b/autodoc/source/ary/inc/sorted_idset.hxx @@ -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 diff --git a/autodoc/source/ary/inc/sortedids.hxx b/autodoc/source/ary/inc/sortedids.hxx index 508f3bc2e0cc..a830937abb81 100644 --- a/autodoc/source/ary/inc/sortedids.hxx +++ b/autodoc/source/ary/inc/sortedids.hxx @@ -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 diff --git a/autodoc/source/ary/inc/store/s_base.hxx b/autodoc/source/ary/inc/store/s_base.hxx index ebc2f8bafa5c..671b2b6fe548 100644 --- a/autodoc/source/ary/inc/store/s_base.hxx +++ b/autodoc/source/ary/inc/store/s_base.hxx @@ -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 diff --git a/autodoc/source/ary/inc/store/s_iterator.hxx b/autodoc/source/ary/inc/store/s_iterator.hxx index fb5f0d9e0f76..717c09512a1a 100644 --- a/autodoc/source/ary/inc/store/s_iterator.hxx +++ b/autodoc/source/ary/inc/store/s_iterator.hxx @@ -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 diff --git a/autodoc/source/ary/inc/store/s_storage.hxx b/autodoc/source/ary/inc/store/s_storage.hxx index 0b02e1a2cd53..6085089d230b 100644 --- a/autodoc/source/ary/inc/store/s_storage.hxx +++ b/autodoc/source/ary/inc/store/s_storage.hxx @@ -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 diff --git a/autodoc/source/ary/inc/traits_impl.hxx b/autodoc/source/ary/inc/traits_impl.hxx index b7ac789e486b..d1a11941d11d 100644 --- a/autodoc/source/ary/inc/traits_impl.hxx +++ b/autodoc/source/ary/inc/traits_impl.hxx @@ -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 diff --git a/autodoc/source/ary/info/all_dts.cxx b/autodoc/source/ary/info/all_dts.cxx index a21eddc53dff..0022e6a4bb58 100644 --- a/autodoc/source/ary/info/all_dts.cxx +++ b/autodoc/source/ary/info/all_dts.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 diff --git a/autodoc/source/ary/info/all_tags.cxx b/autodoc/source/ary/info/all_tags.cxx index 5699efc5bd0f..d6b6ee000771 100644 --- a/autodoc/source/ary/info/all_tags.cxx +++ b/autodoc/source/ary/info/all_tags.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,19 +43,19 @@ namespace info -//***************************** StdTag ***********************// +//***************************** StdTag ***********************// StdTag::StdTag( E_AtTagId i_eId ) - : eId(i_eId), + : eId(i_eId), // aText, pNext(0) { } bool -StdTag::Add_SpecialMeaningToken( const char * , - intt ) +StdTag::Add_SpecialMeaningToken( const char * , + intt ) { // Does nothing @@ -94,18 +94,18 @@ StdTag::Text() -//***************************** BaseTag ***********************// +//***************************** BaseTag ***********************// BaseTag::BaseTag() - : // sBase + : // sBase // aText pNext(0) { } bool -BaseTag::Add_SpecialMeaningToken( const char * i_sText, - intt i_nNr ) +BaseTag::Add_SpecialMeaningToken( const char * i_sText, + intt i_nNr ) { if ( i_nNr == 1 ) { @@ -144,18 +144,18 @@ BaseTag::Text() -//***************************** ExceptionTag ***********************// +//***************************** ExceptionTag ***********************// ExceptionTag::ExceptionTag() - : // sException, + : // sException, // aText pNext(0) { } bool -ExceptionTag::Add_SpecialMeaningToken( const char * i_sText, - intt i_nNr ) +ExceptionTag::Add_SpecialMeaningToken( const char * i_sText, + intt i_nNr ) { if ( i_nNr == 1 ) { @@ -193,18 +193,18 @@ ExceptionTag::Text() } -//***************************** ImplementsTag ***********************// +//***************************** ImplementsTag ***********************// ImplementsTag::ImplementsTag() - : // sBase + : // sBase // aText pNext(0) { } bool -ImplementsTag::Add_SpecialMeaningToken( const char * i_sText, - intt i_nNr ) +ImplementsTag::Add_SpecialMeaningToken( const char * i_sText, + intt i_nNr ) { if ( i_nNr == 1 ) { @@ -245,17 +245,17 @@ ImplementsTag::Text() } -//***************************** KeywordTag ***********************// +//***************************** KeywordTag ***********************// KeywordTag::KeywordTag() -// : sKeys +// : sKeys { } bool -KeywordTag::Add_SpecialMeaningToken( const char * i_sText, - intt ) +KeywordTag::Add_SpecialMeaningToken( const char * i_sText, + intt ) { sKeys.push_back(i_sText); return true; @@ -287,19 +287,19 @@ KeywordTag::Text() -//***************************** ParameterTag ***********************// +//***************************** ParameterTag ***********************// ParameterTag::ParameterTag() - : // sName + : // sName // aText pNext(0) { } bool -ParameterTag::Add_SpecialMeaningToken( const char * i_sText, - intt i_nNr ) +ParameterTag::Add_SpecialMeaningToken( const char * i_sText, + intt i_nNr ) { if ( i_nNr == 1 ) { @@ -346,18 +346,18 @@ ParameterTag::do_StoreAt( DocuDisplay & o_rDisplay ) const -//***************************** SeeTag ***********************// +//***************************** SeeTag ***********************// SeeTag::SeeTag() -// : sReferences +// : sReferences { } bool -SeeTag::Add_SpecialMeaningToken( const char * i_sText, - intt ) +SeeTag::Add_SpecialMeaningToken( const char * i_sText, + intt ) { static QualifiedName aNull_; sReferences.push_back(aNull_); @@ -398,19 +398,19 @@ SeeTag::Text() -//***************************** TemplateTag ***********************// +//***************************** TemplateTag ***********************// TemplateTag::TemplateTag() - : // sName + : // sName // aText pNext(0) { } bool -TemplateTag::Add_SpecialMeaningToken( const char * i_sText, - intt i_nNr ) +TemplateTag::Add_SpecialMeaningToken( const char * i_sText, + intt i_nNr ) { if ( i_nNr == 1 ) { @@ -454,18 +454,18 @@ TemplateTag::Text() } -//***************************** LabelTag ***********************// +//***************************** LabelTag ***********************// LabelTag::LabelTag() - : sLabel() + : sLabel() { } bool -LabelTag::Add_SpecialMeaningToken( const char * i_sText, - intt i_nNr ) +LabelTag::Add_SpecialMeaningToken( const char * i_sText, + intt i_nNr ) { if ( i_nNr == 1 AND sLabel.length() == 0 ) { @@ -473,7 +473,7 @@ LabelTag::Add_SpecialMeaningToken( const char * i_sText, return true; } // KORR_FUTURE -// else // Throw exception because of double label. +// else // Throw exception because of double label. return false; } @@ -502,16 +502,16 @@ LabelTag::Text() } -//***************************** SinceTag ***********************// +//***************************** SinceTag ***********************// SinceTag::SinceTag() - : sVersion() + : sVersion() { } bool -SinceTag::Add_SpecialMeaningToken( const char * i_sText, - intt ) +SinceTag::Add_SpecialMeaningToken( const char * i_sText, + intt ) { const char cCiphersend = '9' + 1; if ( sVersion.empty() diff --git a/autodoc/source/ary/info/ci_attag.cxx b/autodoc/source/ary/info/ci_attag.cxx index 73da1bebe9df..218ea5fb390c 100644 --- a/autodoc/source/ary/info/ci_attag.cxx +++ b/autodoc/source/ary/info/ci_attag.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 @@ -57,7 +57,7 @@ AtTag::Add_Token( const char * i_sText ) } void -AtTag::Add_PotentialLink( const char * i_sText, +AtTag::Add_PotentialLink( const char * i_sText, bool i_bIsGlobal, bool i_bIsFunction ) { diff --git a/autodoc/source/ary/info/ci_text.cxx b/autodoc/source/ary/info/ci_text.cxx index bf4aa5e7a362..dee50d27e908 100644 --- a/autodoc/source/ary/info/ci_text.cxx +++ b/autodoc/source/ary/info/ci_text.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 diff --git a/autodoc/source/ary/kernel/ary_disp.cxx b/autodoc/source/ary/kernel/ary_disp.cxx index b9608f2f547a..eed6d17e3f1b 100644 --- a/autodoc/source/ary/kernel/ary_disp.cxx +++ b/autodoc/source/ary/kernel/ary_disp.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 @@ -62,7 +62,7 @@ Display::DisplaySlot_Rid( ary::Rid i_nId ) void Display::DisplaySlot_LocalCe( ary::cpp::Ce_id i_nId, - const String & i_sName ) + const String & i_sName ) { const cpp::Gate * pGate = Get_ReFinder(); @@ -101,7 +101,7 @@ Display::do_DisplaySlot_Rid( ary::Rid ) void Display::do_DisplaySlot_LocalCe( ary::cpp::Ce_id , - const String & ) + const String & ) { } diff --git a/autodoc/source/ary/kernel/cessentl.cxx b/autodoc/source/ary/kernel/cessentl.cxx index 0fcf37542a6a..e8e29bf80884 100644 --- a/autodoc/source/ary/kernel/cessentl.cxx +++ b/autodoc/source/ary/kernel/cessentl.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 @@ -49,8 +49,8 @@ CeEssentials::CeEssentials() } CeEssentials::CeEssentials( const String & i_sLocalName, - Cid i_nOwner, - loc::Le_id i_nLocation ) + Cid i_nOwner, + loc::Le_id i_nLocation ) : sLocalName(i_sLocalName), nOwner(i_nOwner), nLocation(i_nLocation) diff --git a/autodoc/source/ary/kernel/namesort.cxx b/autodoc/source/ary/kernel/namesort.cxx index 3854ece73e7b..0a64b976aa0b 100644 --- a/autodoc/source/ary/kernel/namesort.cxx +++ b/autodoc/source/ary/kernel/namesort.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 diff --git a/autodoc/source/ary/kernel/qualiname.cxx b/autodoc/source/ary/kernel/qualiname.cxx index 8db4ea07919b..0451485c08ec 100644 --- a/autodoc/source/ary/kernel/qualiname.cxx +++ b/autodoc/source/ary/kernel/qualiname.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 diff --git a/autodoc/source/ary/kernel/reposy.cxx b/autodoc/source/ary/kernel/reposy.cxx index 5d28d46bb1be..99bfcf90a737 100644 --- a/autodoc/source/ary/kernel/reposy.cxx +++ b/autodoc/source/ary/kernel/reposy.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 diff --git a/autodoc/source/ary/kernel/slots.cxx b/autodoc/source/ary/kernel/slots.cxx index 5689432cd8e8..1e7e4b49a697 100644 --- a/autodoc/source/ary/kernel/slots.cxx +++ b/autodoc/source/ary/kernel/slots.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 diff --git a/autodoc/source/ary/loc/loc_dir.cxx b/autodoc/source/ary/loc/loc_dir.cxx index 220f47486332..0a3fcf3e18c0 100644 --- a/autodoc/source/ary/loc/loc_dir.cxx +++ b/autodoc/source/ary/loc/loc_dir.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 diff --git a/autodoc/source/ary/loc/loc_file.cxx b/autodoc/source/ary/loc/loc_file.cxx index 5de548219842..dc05de03b542 100644 --- a/autodoc/source/ary/loc/loc_file.cxx +++ b/autodoc/source/ary/loc/loc_file.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 diff --git a/autodoc/source/ary/loc/loc_filebase.cxx b/autodoc/source/ary/loc/loc_filebase.cxx index f9297084c552..0daaee2cedc2 100644 --- a/autodoc/source/ary/loc/loc_filebase.cxx +++ b/autodoc/source/ary/loc/loc_filebase.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 diff --git a/autodoc/source/ary/loc/loc_root.cxx b/autodoc/source/ary/loc/loc_root.cxx index 198b6ee7f784..dca36206c109 100644 --- a/autodoc/source/ary/loc/loc_root.cxx +++ b/autodoc/source/ary/loc/loc_root.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 diff --git a/autodoc/source/ary/loc/loc_traits.cxx b/autodoc/source/ary/loc/loc_traits.cxx index 8e010beef263..eb314d111357 100644 --- a/autodoc/source/ary/loc/loc_traits.cxx +++ b/autodoc/source/ary/loc/loc_traits.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 diff --git a/autodoc/source/ary/loc/loca_le.cxx b/autodoc/source/ary/loc/loca_le.cxx index 428ca5849ccb..e16d304a599f 100644 --- a/autodoc/source/ary/loc/loca_le.cxx +++ b/autodoc/source/ary/loc/loca_le.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 diff --git a/autodoc/source/ary/loc/loca_le.hxx b/autodoc/source/ary/loc/loca_le.hxx index 8f206f7c1c98..112343b6e39e 100644 --- a/autodoc/source/ary/loc/loca_le.hxx +++ b/autodoc/source/ary/loc/loca_le.hxx @@ -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 diff --git a/autodoc/source/ary/loc/locs_le.cxx b/autodoc/source/ary/loc/locs_le.cxx index 1f2df4430173..76babbf10254 100644 --- a/autodoc/source/ary/loc/locs_le.cxx +++ b/autodoc/source/ary/loc/locs_le.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 diff --git a/autodoc/source/ary/loc/locs_le.hxx b/autodoc/source/ary/loc/locs_le.hxx index 1d1494ccbc5f..88639d6cc097 100644 --- a/autodoc/source/ary/loc/locs_le.hxx +++ b/autodoc/source/ary/loc/locs_le.hxx @@ -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 diff --git a/autodoc/source/ary_i/kernel/ci_atag2.cxx b/autodoc/source/ary_i/kernel/ci_atag2.cxx index 6eabded958ed..21c01f7aa728 100644 --- a/autodoc/source/ary_i/kernel/ci_atag2.cxx +++ b/autodoc/source/ary_i/kernel/ci_atag2.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 @@ -41,7 +41,7 @@ namespace inf void DocuTag_Display::Display_TextToken( const csi::dsapi::DT_TextToken & ) {} -void DocuTag_Display::Display_White() {} +void DocuTag_Display::Display_White() {} void DocuTag_Display::Display_MupType( const csi::dsapi::DT_MupType & ) {} void DocuTag_Display::Display_MupMember( diff --git a/autodoc/source/ary_i/kernel/ci_text2.cxx b/autodoc/source/ary_i/kernel/ci_text2.cxx index d5d60c7b2399..364584891cdc 100644 --- a/autodoc/source/ary_i/kernel/ci_text2.cxx +++ b/autodoc/source/ary_i/kernel/ci_text2.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 @@ -67,7 +67,7 @@ DocuTex2::DisplayAt( DocumentationDisplay & o_rDisplay ) const } void -DocuTex2::AddToken( DYN DocuToken & let_drToken ) +DocuTex2::AddToken( DYN DocuToken & let_drToken ) { if (aTokens.empty()) { diff --git a/autodoc/source/ary_i/kernel/d_token.cxx b/autodoc/source/ary_i/kernel/d_token.cxx index 6157614ef30a..d98fc84d8b3d 100644 --- a/autodoc/source/ary_i/kernel/d_token.cxx +++ b/autodoc/source/ary_i/kernel/d_token.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 diff --git a/autodoc/source/display/html/aryattrs.cxx b/autodoc/source/display/html/aryattrs.cxx index 2eef10ded2e9..106ff4b73625 100644 --- a/autodoc/source/display/html/aryattrs.cxx +++ b/autodoc/source/display/html/aryattrs.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 diff --git a/autodoc/source/display/html/aryattrs.hxx b/autodoc/source/display/html/aryattrs.hxx index 16d762f750a2..92de17746529 100644 --- a/autodoc/source/display/html/aryattrs.hxx +++ b/autodoc/source/display/html/aryattrs.hxx @@ -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 diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx index 8a4a9f6bc91f..7cf1263a65c0 100644 --- a/autodoc/source/display/html/cfrstd.cxx +++ b/autodoc/source/display/html/cfrstd.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 @@ -45,7 +45,7 @@ Colors: Fonts: - page title 20, bold, Arial -- navibar main 12, bold, Arial +- navibar main 12, bold, Arial - navibar sub 8, Arial, kapitälchen - attrtable title line 8, bold, Arial, kapitälchen - attrtable value line 8, Arial kapitälchen @@ -254,10 +254,10 @@ StdFrame::LogoSrc() const // return new Html_Image( "logodot-blu.gif", // "109", -// "54", -// "RIGHT", -// "0", -// "OpenOffice" ); +// "54", +// "RIGHT", +// "0", +// "OpenOffice" ); } diff --git a/autodoc/source/display/html/chd_udk2.cxx b/autodoc/source/display/html/chd_udk2.cxx index 76380aecc6fa..5d2a3f27c296 100644 --- a/autodoc/source/display/html/chd_udk2.cxx +++ b/autodoc/source/display/html/chd_udk2.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 diff --git a/autodoc/source/display/html/cre_link.cxx b/autodoc/source/display/html/cre_link.cxx index 74561b027e73..2635ece81da7 100644 --- a/autodoc/source/display/html/cre_link.cxx +++ b/autodoc/source/display/html/cre_link.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 diff --git a/autodoc/source/display/html/cre_link.hxx b/autodoc/source/display/html/cre_link.hxx index c79523ff655f..ff0c5753f742 100644 --- a/autodoc/source/display/html/cre_link.hxx +++ b/autodoc/source/display/html/cre_link.hxx @@ -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 diff --git a/autodoc/source/display/html/dsply_cl.cxx b/autodoc/source/display/html/dsply_cl.cxx index f590889683c4..8a570ae33095 100644 --- a/autodoc/source/display/html/dsply_cl.cxx +++ b/autodoc/source/display/html/dsply_cl.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 diff --git a/autodoc/source/display/html/dsply_cl.hxx b/autodoc/source/display/html/dsply_cl.hxx index f2be896d2564..9ba6d76ea778 100644 --- a/autodoc/source/display/html/dsply_cl.hxx +++ b/autodoc/source/display/html/dsply_cl.hxx @@ -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 @@ -57,11 +57,11 @@ class ClassDisplayer : public ary::Display, ClassDisplayer( // TODO OuputPage_Environment & io_rEnv ); - virtual ~ClassDisplayer(); + virtual ~ClassDisplayer(); private: // Interface csv::ConstProcessor<>: - virtual void do_Process( + virtual void do_Process( const ary::cpp::Class & i_data ); // Interface ary::Display: diff --git a/autodoc/source/display/html/dsply_da.cxx b/autodoc/source/display/html/dsply_da.cxx index 4989e774f946..17614c7d865a 100644 --- a/autodoc/source/display/html/dsply_da.cxx +++ b/autodoc/source/display/html/dsply_da.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 diff --git a/autodoc/source/display/html/dsply_da.hxx b/autodoc/source/display/html/dsply_da.hxx index 45f0b15f9503..a8d29fc249b1 100644 --- a/autodoc/source/display/html/dsply_da.hxx +++ b/autodoc/source/display/html/dsply_da.hxx @@ -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 @@ -64,7 +64,7 @@ class DataDisplay : public ary::Display, DataDisplay( OuputPage_Environment & io_rInfo ); - virtual ~DataDisplay(); + virtual ~DataDisplay(); void PrepareForConstants(); void PrepareForVariables(); diff --git a/autodoc/source/display/html/dsply_op.cxx b/autodoc/source/display/html/dsply_op.cxx index e34db602ff6a..dbbd1ac728dd 100644 --- a/autodoc/source/display/html/dsply_op.cxx +++ b/autodoc/source/display/html/dsply_op.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 diff --git a/autodoc/source/display/html/dsply_op.hxx b/autodoc/source/display/html/dsply_op.hxx index 27f2657a0f57..9367489fa596 100644 --- a/autodoc/source/display/html/dsply_op.hxx +++ b/autodoc/source/display/html/dsply_op.hxx @@ -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 @@ -64,7 +64,7 @@ class OperationsDisplay : public ary::Display, OperationsDisplay( OuputPage_Environment & io_rInfo ); - virtual ~OperationsDisplay(); + virtual ~OperationsDisplay(); void PrepareForStdMembers(); void PrepareForStaticMembers(); diff --git a/autodoc/source/display/html/easywri.cxx b/autodoc/source/display/html/easywri.cxx index b68b36d011d4..79ff4273e48e 100644 --- a/autodoc/source/display/html/easywri.cxx +++ b/autodoc/source/display/html/easywri.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 diff --git a/autodoc/source/display/html/easywri.hxx b/autodoc/source/display/html/easywri.hxx index 9a70a3c5b91c..53e56e3f24c4 100644 --- a/autodoc/source/display/html/easywri.hxx +++ b/autodoc/source/display/html/easywri.hxx @@ -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 diff --git a/autodoc/source/display/html/hd_chlst.cxx b/autodoc/source/display/html/hd_chlst.cxx index 8e3c3c95ced1..c537ac58fe07 100644 --- a/autodoc/source/display/html/hd_chlst.cxx +++ b/autodoc/source/display/html/hd_chlst.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 diff --git a/autodoc/source/display/html/hd_chlst.hxx b/autodoc/source/display/html/hd_chlst.hxx index cbd784d4ed2c..5cb388756182 100644 --- a/autodoc/source/display/html/hd_chlst.hxx +++ b/autodoc/source/display/html/hd_chlst.hxx @@ -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 @@ -98,7 +98,7 @@ class ChildList_Display : public ary::Display, const ary::cpp::Enum & i_rEnum ); - virtual ~ChildList_Display(); + virtual ~ChildList_Display(); void Run_Simple( Area_Result & o_rResult, @@ -134,7 +134,7 @@ class ChildList_Display : public ary::Display, i_eFilter ); private: // Interface csv::ConstProcessor<>: - virtual void do_Process( + virtual void do_Process( const ary::cpp::Namespace & i_rData ); /** i_rData is shown only, if it passes two filters: @@ -143,22 +143,22 @@ class ChildList_Display : public ary::Display, pClassFilter. A not exsting filter allows i_rData to be displayed. */ - virtual void do_Process( + virtual void do_Process( const ary::cpp::Class & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Enum & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Typedef & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Function & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Variable & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::EnumValue & i_rData ); private: diff --git a/autodoc/source/display/html/hd_docu.cxx b/autodoc/source/display/html/hd_docu.cxx index 0e0cb97dd047..7a5e73d94e97 100644 --- a/autodoc/source/display/html/hd_docu.cxx +++ b/autodoc/source/display/html/hd_docu.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 diff --git a/autodoc/source/display/html/hd_docu.hxx b/autodoc/source/display/html/hd_docu.hxx index 1eb00ae1c449..3ea2c93a1ede 100644 --- a/autodoc/source/display/html/hd_docu.hxx +++ b/autodoc/source/display/html/hd_docu.hxx @@ -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 @@ -77,7 +77,7 @@ class Docu_Display : public ary::Display, Docu_Display( OuputPage_Environment & io_rEnv ); - virtual ~Docu_Display(); + virtual ~Docu_Display(); void Assign_Out( csi::xml::Element & o_rOut ); @@ -134,25 +134,25 @@ class Docu_Display : public ary::Display, private: // Interface csv::ConstProcessor<>: - virtual void do_Process( + virtual void do_Process( const ary::cpp::Namespace & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Class & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Enum & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Typedef & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Function & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Variable & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::doc::Documentation & i_rData ); // Interface ary::Display: diff --git a/autodoc/source/display/html/hdimpl.cxx b/autodoc/source/display/html/hdimpl.cxx index f9d2b0f1636a..dd5a787d5159 100644 --- a/autodoc/source/display/html/hdimpl.cxx +++ b/autodoc/source/display/html/hdimpl.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 diff --git a/autodoc/source/display/html/hdimpl.hxx b/autodoc/source/display/html/hdimpl.hxx index 6caf652d499f..b6f8390d182d 100644 --- a/autodoc/source/display/html/hdimpl.hxx +++ b/autodoc/source/display/html/hdimpl.hxx @@ -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 diff --git a/autodoc/source/display/html/html_kit.cxx b/autodoc/source/display/html/html_kit.cxx index 32ab5252a00c..f6c079070264 100644 --- a/autodoc/source/display/html/html_kit.cxx +++ b/autodoc/source/display/html/html_kit.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 diff --git a/autodoc/source/display/html/html_kit.hxx b/autodoc/source/display/html/html_kit.hxx index 35aba2887cdb..5df8b0b96bc4 100644 --- a/autodoc/source/display/html/html_kit.hxx +++ b/autodoc/source/display/html/html_kit.hxx @@ -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 diff --git a/autodoc/source/display/html/nav_main.cxx b/autodoc/source/display/html/nav_main.cxx index 781636fc9844..2ebbe0e16401 100644 --- a/autodoc/source/display/html/nav_main.cxx +++ b/autodoc/source/display/html/nav_main.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 diff --git a/autodoc/source/display/html/nav_main.hxx b/autodoc/source/display/html/nav_main.hxx index fe3e79c822e4..233a1748d215 100644 --- a/autodoc/source/display/html/nav_main.hxx +++ b/autodoc/source/display/html/nav_main.hxx @@ -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 diff --git a/autodoc/source/display/html/navibar.cxx b/autodoc/source/display/html/navibar.cxx index 8490e834b6d8..ede7e432538a 100644 --- a/autodoc/source/display/html/navibar.cxx +++ b/autodoc/source/display/html/navibar.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 @@ -271,7 +271,7 @@ NavigationBar::MakeSubRow( const char * i_sTitle ) } void -NavigationBar::AddItem( const char * i_sName, +NavigationBar::AddItem( const char * i_sName, const char * i_sLink, bool i_bValid ) { diff --git a/autodoc/source/display/html/navibar.hxx b/autodoc/source/display/html/navibar.hxx index ec81e6e94e5c..49f83b537a9e 100644 --- a/autodoc/source/display/html/navibar.hxx +++ b/autodoc/source/display/html/navibar.hxx @@ -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 @@ -92,10 +92,10 @@ class NavigationBar E_CeGatheringType i_eCeGatheringType ); ~NavigationBar(); - void MakeSubRow( - const char * i_sTitle ); - void AddItem( /// Items are added to last made sub-row. - const char * i_sName, + void MakeSubRow( + const char * i_sTitle ); + void AddItem( /// Items are added to last made sub-row. + const char * i_sName, const char * i_sLink, bool i_bValid ); /** This writes the main bar and the pSubRowTable to o_rOut. diff --git a/autodoc/source/display/html/opageenv.cxx b/autodoc/source/display/html/opageenv.cxx index 87a170ff686b..d52fdc166a04 100644 --- a/autodoc/source/display/html/opageenv.cxx +++ b/autodoc/source/display/html/opageenv.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 diff --git a/autodoc/source/display/html/opageenv.hxx b/autodoc/source/display/html/opageenv.hxx index c0bb48ef5962..23e4aeb9cfef 100644 --- a/autodoc/source/display/html/opageenv.hxx +++ b/autodoc/source/display/html/opageenv.hxx @@ -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 diff --git a/autodoc/source/display/html/outfile.cxx b/autodoc/source/display/html/outfile.cxx index 82ab2eac7749..bf290e67638b 100644 --- a/autodoc/source/display/html/outfile.cxx +++ b/autodoc/source/display/html/outfile.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 @@ -227,7 +227,7 @@ const char * const HtmlDocuFile::HtmlDocuFile() - : sFilePath(), + : sFilePath(), sTitle(), sLocation(), sCopyright(), @@ -303,7 +303,7 @@ HtmlDocuFile::CreateFile() } void -HtmlDocuFile::WriteCssFile( const csv::ploc::Path & i_rFilePath ) +HtmlDocuFile::WriteCssFile( const csv::ploc::Path & i_rFilePath ) { Cout() << "\nCreate css file ..." << Endl(); diff --git a/autodoc/source/display/html/outfile.hxx b/autodoc/source/display/html/outfile.hxx index 033e92954a3d..f4d14c124d79 100644 --- a/autodoc/source/display/html/outfile.hxx +++ b/autodoc/source/display/html/outfile.hxx @@ -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 @@ -48,7 +48,7 @@ class HtmlDocuFile // LIFECYCLE HtmlDocuFile(); - void SetLocation( + void SetLocation( const csv::ploc::Path & i_rFilePath, uintt i_depthInOutputTree ); @@ -58,26 +58,26 @@ class HtmlDocuFile const char * i_sCopyright ); void EmptyBody(); - Html::Body & Body() { return aBodyData; } - bool CreateFile(); + Html::Body & Body() { return aBodyData; } + bool CreateFile(); static void WriteCssFile( const csv::ploc::Path & i_rFilePath ); private: - void WriteHeader( - csv::File & io_aFile ); - void WriteBody( - csv::File & io_aFile ); + void WriteHeader( + csv::File & io_aFile ); + void WriteBody( + csv::File & io_aFile ); // DATA - String sFilePath; - String sTitle; - String sLocation; + String sFilePath; + String sTitle; + String sLocation; String sCopyright; uintt nDepthInOutputTree; - Html::Body aBodyData; + Html::Body aBodyData; StreamStr aBuffer; // Output buffer, should be transfered into csv::File. }; diff --git a/autodoc/source/display/html/pagemake.cxx b/autodoc/source/display/html/pagemake.cxx index 52d05fb0b19c..436ab40fb50c 100644 --- a/autodoc/source/display/html/pagemake.cxx +++ b/autodoc/source/display/html/pagemake.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 diff --git a/autodoc/source/display/html/pagemake.hxx b/autodoc/source/display/html/pagemake.hxx index 72cdbe56e739..62fc7d4d5181 100644 --- a/autodoc/source/display/html/pagemake.hxx +++ b/autodoc/source/display/html/pagemake.hxx @@ -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 @@ -71,7 +71,7 @@ class PageDisplay : public ary::Display, PageDisplay( OuputPage_Environment & io_rEnv ); - virtual ~PageDisplay(); + virtual ~PageDisplay(); void Create_OverviewFile(); void Create_AllDefsFile(); @@ -108,13 +108,13 @@ class PageDisplay : public ary::Display, private: // Interface csv::ConstProcessor<>: - virtual void do_Process( + virtual void do_Process( const ary::cpp::Class & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Enum & i_rData ); - virtual void do_Process( + virtual void do_Process( const ary::cpp::Typedef & i_rData ); // Interface ary::cpp::Display: @@ -156,7 +156,7 @@ class PageDisplay : public ary::Display, int i_nLetter ); // DATA - Dyn<HtmlDocuFile> pMyFile; + Dyn<HtmlDocuFile> pMyFile; }; diff --git a/autodoc/source/display/html/pm_aldef.cxx b/autodoc/source/display/html/pm_aldef.cxx index 7669ba4ef3a7..1ca8743dc9c1 100644 --- a/autodoc/source/display/html/pm_aldef.cxx +++ b/autodoc/source/display/html/pm_aldef.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 diff --git a/autodoc/source/display/html/pm_aldef.hxx b/autodoc/source/display/html/pm_aldef.hxx index 8f01cbb7a28a..14700e971dbd 100644 --- a/autodoc/source/display/html/pm_aldef.hxx +++ b/autodoc/source/display/html/pm_aldef.hxx @@ -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 @@ -56,7 +56,7 @@ class PageMaker_AllDefs : public SpecializedPageMaker PageMaker_AllDefs( PageDisplay & io_rPage ); - virtual ~PageMaker_AllDefs(); + virtual ~PageMaker_AllDefs(); virtual void MakePage(); diff --git a/autodoc/source/display/html/pm_base.cxx b/autodoc/source/display/html/pm_base.cxx index ae045bd3b1de..5e762d352803 100644 --- a/autodoc/source/display/html/pm_base.cxx +++ b/autodoc/source/display/html/pm_base.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 @@ -67,7 +67,7 @@ SpecializedPageMaker::Write_DocuArea() // const char * , // const char * ) //{ -// // Dummy +// // Dummy //} csi::xml::Element & diff --git a/autodoc/source/display/html/pm_base.hxx b/autodoc/source/display/html/pm_base.hxx index 2afa8a77cdfc..45ef09dcecab 100644 --- a/autodoc/source/display/html/pm_base.hxx +++ b/autodoc/source/display/html/pm_base.hxx @@ -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 diff --git a/autodoc/source/display/html/pm_class.cxx b/autodoc/source/display/html/pm_class.cxx index 16c4fe9a9aea..8c22be5c296a 100644 --- a/autodoc/source/display/html/pm_class.cxx +++ b/autodoc/source/display/html/pm_class.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 diff --git a/autodoc/source/display/html/pm_class.hxx b/autodoc/source/display/html/pm_class.hxx index 71d9f604c602..b3c590053bb5 100644 --- a/autodoc/source/display/html/pm_class.hxx +++ b/autodoc/source/display/html/pm_class.hxx @@ -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 @@ -71,7 +71,7 @@ class PageMaker_Class : public SpecializedPageMaker const ary::cpp::Class & i_rClass ); - virtual ~PageMaker_Class(); + virtual ~PageMaker_Class(); virtual void MakePage(); diff --git a/autodoc/source/display/html/pm_help.cxx b/autodoc/source/display/html/pm_help.cxx index 80a832e05510..44c5eb8fea88 100644 --- a/autodoc/source/display/html/pm_help.cxx +++ b/autodoc/source/display/html/pm_help.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 diff --git a/autodoc/source/display/html/pm_help.hxx b/autodoc/source/display/html/pm_help.hxx index e40f2f3f503b..fb9c1f56b1f7 100644 --- a/autodoc/source/display/html/pm_help.hxx +++ b/autodoc/source/display/html/pm_help.hxx @@ -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 @@ -45,7 +45,7 @@ class PageMaker_Help : public SpecializedPageMaker PageMaker_Help( PageDisplay & io_rPage ); - virtual ~PageMaker_Help(); + virtual ~PageMaker_Help(); virtual void MakePage(); diff --git a/autodoc/source/display/html/pm_index.cxx b/autodoc/source/display/html/pm_index.cxx index 122329e9dcdb..e70b7f19db3e 100644 --- a/autodoc/source/display/html/pm_index.cxx +++ b/autodoc/source/display/html/pm_index.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 diff --git a/autodoc/source/display/html/pm_index.hxx b/autodoc/source/display/html/pm_index.hxx index e558292e3eae..8224f37259ef 100644 --- a/autodoc/source/display/html/pm_index.hxx +++ b/autodoc/source/display/html/pm_index.hxx @@ -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 @@ -76,7 +76,7 @@ class PageMaker_Index : public SpecializedPageMaker, PageDisplay & io_rPage, char i_c ); - virtual ~PageMaker_Index(); + virtual ~PageMaker_Index(); virtual void MakePage(); diff --git a/autodoc/source/display/html/pm_namsp.cxx b/autodoc/source/display/html/pm_namsp.cxx index ea07fc77a45c..e2f88026d2bb 100644 --- a/autodoc/source/display/html/pm_namsp.cxx +++ b/autodoc/source/display/html/pm_namsp.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 diff --git a/autodoc/source/display/html/pm_namsp.hxx b/autodoc/source/display/html/pm_namsp.hxx index c2f0535ad7d7..5c1322c8f39e 100644 --- a/autodoc/source/display/html/pm_namsp.hxx +++ b/autodoc/source/display/html/pm_namsp.hxx @@ -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 @@ -46,7 +46,7 @@ class PageMaker_Namespace : public SpecializedPageMaker PageMaker_Namespace( PageDisplay & io_rPage ); - virtual ~PageMaker_Namespace(); + virtual ~PageMaker_Namespace(); virtual void MakePage(); diff --git a/autodoc/source/display/html/pm_start.cxx b/autodoc/source/display/html/pm_start.cxx index 335783b1b809..9efb3595d18e 100644 --- a/autodoc/source/display/html/pm_start.cxx +++ b/autodoc/source/display/html/pm_start.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 diff --git a/autodoc/source/display/html/pm_start.hxx b/autodoc/source/display/html/pm_start.hxx index 26614b33bc7d..1085e1e5d124 100644 --- a/autodoc/source/display/html/pm_start.hxx +++ b/autodoc/source/display/html/pm_start.hxx @@ -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 @@ -45,7 +45,7 @@ class PageMaker_Overview : public SpecializedPageMaker PageMaker_Overview( PageDisplay & io_rPage ); - virtual ~PageMaker_Overview(); + virtual ~PageMaker_Overview(); virtual void MakePage(); diff --git a/autodoc/source/display/html/protarea.cxx b/autodoc/source/display/html/protarea.cxx index d581014eccac..6b50ad8d4555 100644 --- a/autodoc/source/display/html/protarea.cxx +++ b/autodoc/source/display/html/protarea.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 diff --git a/autodoc/source/display/html/protarea.hxx b/autodoc/source/display/html/protarea.hxx index 348afbe5ef78..007b51613a73 100644 --- a/autodoc/source/display/html/protarea.hxx +++ b/autodoc/source/display/html/protarea.hxx @@ -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 diff --git a/autodoc/source/display/html/strconst.hxx b/autodoc/source/display/html/strconst.hxx index 0bddc803249d..cbc131cdfe03 100644 --- a/autodoc/source/display/html/strconst.hxx +++ b/autodoc/source/display/html/strconst.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_constgroup.cxx b/autodoc/source/display/idl/hfi_constgroup.cxx index d197e55234db..d61584e54b0e 100644 --- a/autodoc/source/display/idl/hfi_constgroup.cxx +++ b/autodoc/source/display/idl/hfi_constgroup.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 diff --git a/autodoc/source/display/idl/hfi_constgroup.hxx b/autodoc/source/display/idl/hfi_constgroup.hxx index 044f8925ed01..4e5dd8f6b5fa 100644 --- a/autodoc/source/display/idl/hfi_constgroup.hxx +++ b/autodoc/source/display/idl/hfi_constgroup.hxx @@ -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 @@ -44,12 +44,12 @@ class HF_IdlConstGroup : public HtmlFactory_Idl Xml::Element & o_rOut ); virtual ~HF_IdlConstGroup(); - void Produce_byData( + void Produce_byData( const client & ce ) const; private: HF_NaviSubRow & make_Navibar( const client & ce ) const; - virtual void produce_MemberDetails( + virtual void produce_MemberDetails( HF_SubTitleTable & o_table, const client & ce ) const; }; diff --git a/autodoc/source/display/idl/hfi_doc.cxx b/autodoc/source/display/idl/hfi_doc.cxx index c379021a845e..07ee3db97bee 100644 --- a/autodoc/source/display/idl/hfi_doc.cxx +++ b/autodoc/source/display/idl/hfi_doc.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 diff --git a/autodoc/source/display/idl/hfi_doc.hxx b/autodoc/source/display/idl/hfi_doc.hxx index c27e9708b485..a9f28305a68b 100644 --- a/autodoc/source/display/idl/hfi_doc.hxx +++ b/autodoc/source/display/idl/hfi_doc.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_enum.cxx b/autodoc/source/display/idl/hfi_enum.cxx index 18f97880bc7f..441881918ab5 100644 --- a/autodoc/source/display/idl/hfi_enum.cxx +++ b/autodoc/source/display/idl/hfi_enum.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 diff --git a/autodoc/source/display/idl/hfi_enum.hxx b/autodoc/source/display/idl/hfi_enum.hxx index 1f92b983a4ba..0ceafdf26454 100644 --- a/autodoc/source/display/idl/hfi_enum.hxx +++ b/autodoc/source/display/idl/hfi_enum.hxx @@ -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 @@ -46,12 +46,12 @@ class HF_IdlEnum : public HtmlFactory_Idl Xml::Element & o_rOut ); virtual ~HF_IdlEnum(); - void Produce_byData( + void Produce_byData( const client & ce ) const; private: HF_NaviSubRow & make_Navibar( const client & ce ) const; - virtual void produce_MemberDetails( + virtual void produce_MemberDetails( HF_SubTitleTable & o_table, const client & ce ) const; }; diff --git a/autodoc/source/display/idl/hfi_globalindex.cxx b/autodoc/source/display/idl/hfi_globalindex.cxx index dc0766b665b8..e76a411c6556 100644 --- a/autodoc/source/display/idl/hfi_globalindex.cxx +++ b/autodoc/source/display/idl/hfi_globalindex.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 diff --git a/autodoc/source/display/idl/hfi_globalindex.hxx b/autodoc/source/display/idl/hfi_globalindex.hxx index fe1c254b47f6..eaf4c7d449ac 100644 --- a/autodoc/source/display/idl/hfi_globalindex.hxx +++ b/autodoc/source/display/idl/hfi_globalindex.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx b/autodoc/source/display/idl/hfi_hierarchy.cxx index c968b9d2c8d4..6b2f8b8f578e 100644 --- a/autodoc/source/display/idl/hfi_hierarchy.cxx +++ b/autodoc/source/display/idl/hfi_hierarchy.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 diff --git a/autodoc/source/display/idl/hfi_hierarchy.hxx b/autodoc/source/display/idl/hfi_hierarchy.hxx index 1da58b14cf0c..d0a8c7636c5d 100644 --- a/autodoc/source/display/idl/hfi_hierarchy.hxx +++ b/autodoc/source/display/idl/hfi_hierarchy.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_interface.cxx b/autodoc/source/display/idl/hfi_interface.cxx index d5e35a5e2a83..2f60a36dd20f 100644 --- a/autodoc/source/display/idl/hfi_interface.cxx +++ b/autodoc/source/display/idl/hfi_interface.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 diff --git a/autodoc/source/display/idl/hfi_interface.hxx b/autodoc/source/display/idl/hfi_interface.hxx index 5566649381da..74af1eab5037 100644 --- a/autodoc/source/display/idl/hfi_interface.hxx +++ b/autodoc/source/display/idl/hfi_interface.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_linklist.cxx b/autodoc/source/display/idl/hfi_linklist.cxx index f0cf47e29c8c..12810b8e760a 100644 --- a/autodoc/source/display/idl/hfi_linklist.cxx +++ b/autodoc/source/display/idl/hfi_linklist.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 diff --git a/autodoc/source/display/idl/hfi_linklist.hxx b/autodoc/source/display/idl/hfi_linklist.hxx index 83a8998a2976..4cfe3d8dc7d0 100644 --- a/autodoc/source/display/idl/hfi_linklist.hxx +++ b/autodoc/source/display/idl/hfi_linklist.hxx @@ -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 @@ -85,7 +85,7 @@ class HF_MemberTable : public HtmlFactory_Idl Html::Table * pTable; Xml::Element * pCurDeclaration; Xml::Element * pCurDescription; - bool bInline; + bool bInline; }; diff --git a/autodoc/source/display/idl/hfi_method.cxx b/autodoc/source/display/idl/hfi_method.cxx index b5d1aa9d3d8c..288f1dea57a9 100644 --- a/autodoc/source/display/idl/hfi_method.cxx +++ b/autodoc/source/display/idl/hfi_method.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 @@ -86,7 +86,7 @@ HF_IdlMethod::write_Declaration( const String & i_sName, param_list & i_rParams, type_list & i_rExceptions, bool i_bOneway, - bool i_bEllipse ) const + bool i_bEllipse ) const { HF_FunctionDeclaration aDecl(CurOut(), "raises") ; diff --git a/autodoc/source/display/idl/hfi_method.hxx b/autodoc/source/display/idl/hfi_method.hxx index 7da0e5fd605c..eea58978d5c7 100644 --- a/autodoc/source/display/idl/hfi_method.hxx +++ b/autodoc/source/display/idl/hfi_method.hxx @@ -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 @@ -69,7 +69,7 @@ class HF_IdlMethod : public HtmlFactory_Idl param_list & i_rParams, type_list & i_rExceptions, bool i_bOneway, - bool i_bEllipse, + bool i_bEllipse, const client & i_ce ) const; private: void write_Declaration( @@ -78,7 +78,7 @@ class HF_IdlMethod : public HtmlFactory_Idl param_list & i_rParams, type_list & i_rExceptions, bool i_bOneway, - bool i_bEllipse ) const; + bool i_bEllipse ) const; // void write_Param( // HF_IdlTypeText & o_type, // Xml::Element & o_names, diff --git a/autodoc/source/display/idl/hfi_module.cxx b/autodoc/source/display/idl/hfi_module.cxx index eb65a14de9ae..e2923c912a2a 100644 --- a/autodoc/source/display/idl/hfi_module.cxx +++ b/autodoc/source/display/idl/hfi_module.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 diff --git a/autodoc/source/display/idl/hfi_module.hxx b/autodoc/source/display/idl/hfi_module.hxx index 23aa25176cb5..4af2f33438e7 100644 --- a/autodoc/source/display/idl/hfi_module.hxx +++ b/autodoc/source/display/idl/hfi_module.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_navibar.cxx b/autodoc/source/display/idl/hfi_navibar.cxx index eb33b3e84905..098361fe14f1 100644 --- a/autodoc/source/display/idl/hfi_navibar.cxx +++ b/autodoc/source/display/idl/hfi_navibar.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 @@ -39,11 +39,11 @@ #include "hfi_service.hxx" #include "hi_linkhelper.hxx" - + extern const String C_sLocalManualLinks("#devmanual"); - + const String C_sTop = "Overview"; const String C_sModule = "Module"; const String C_sUse = "Use"; @@ -80,18 +80,18 @@ HF_IdlNavigationBar::Produce_CeMainRow( const client & i_ce, Env().Get_LinkTo( rLink.reset(), Env().Linker().PositionOf_CurModule() ); aNaviMain.Add_StdItem( C_sModule, rLink.c_str() ); - + if (i_bNoUsePage) { aNaviMain.Add_NoneItem( C_sUse ); } else { - Env().Get_LinkTo( rLink.reset(), + Env().Get_LinkTo( rLink.reset(), Env().Linker().PositionOf_CurXRefs(i_ce.LocalName()) ); aNaviMain.Add_StdItem( C_sUse, rLink.c_str() ); } - + const StringVector & rManualDescrs = i_ce.Secondaries().Links2DescriptionInManual(); if (rManualDescrs.size() == 2) @@ -148,7 +148,7 @@ HF_IdlNavigationBar::Produce_CeXrefsMainRow( const client & i_ce ) aNaviMain.Add_NoneItem( C_sManual ); } - Env().Get_LinkTo( rLink.reset(), + Env().Get_LinkTo( rLink.reset(), Env().Linker().PositionOf_Index() ); aNaviMain.Add_StdItem( C_sIndex, rLink.c_str() ); @@ -171,23 +171,23 @@ HF_IdlNavigationBar::Produce_ModuleMainRow( const client & i_ce ) aNaviMain.Add_SelfItem( C_sModule ); aNaviMain.Add_NoneItem( C_sUse ); - + const StringVector & rManualDescrs = i_ce.Secondaries().Links2DescriptionInManual(); if (rManualDescrs.size() == 1) { aNaviMain.Add_StdItem(C_sManual, Env().Link2Manual( rManualDescrs.front() )); - } + } else if (rManualDescrs.size() > 1) { aNaviMain.Add_StdItem(C_sManual, C_sLocalManualLinks); - } + } else { aNaviMain.Add_NoneItem( C_sManual ); } - Env().Get_LinkTo( rLink.reset(), + Env().Get_LinkTo( rLink.reset(), Env().Linker().PositionOf_Index() ); aNaviMain.Add_StdItem( C_sIndex, rLink.c_str() ); diff --git a/autodoc/source/display/idl/hfi_navibar.hxx b/autodoc/source/display/idl/hfi_navibar.hxx index d6ffc16ba455..70edf2057f38 100644 --- a/autodoc/source/display/idl/hfi_navibar.hxx +++ b/autodoc/source/display/idl/hfi_navibar.hxx @@ -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 @@ -35,16 +35,16 @@ // COMPONENTS #include "hi_factory.hxx" // PARAMETERS - + namespace ary { namespace idl { -class CodeEntity; +class CodeEntity; } } - - + + class HF_NaviSubRow; /** @resp @@ -54,8 +54,8 @@ class HF_IdlNavigationBar : public HtmlFactory_Idl { public: HF_IdlNavigationBar( - HtmlEnvironment_Idl & - io_rEnv, + HtmlEnvironment_Idl & + io_rEnv, Xml::Element & o_rOut ); virtual ~HF_IdlNavigationBar(); @@ -70,13 +70,13 @@ class HF_IdlNavigationBar : public HtmlFactory_Idl /** Adds the subrow to the o_rOut argument of the constructor. */ - DYN HF_NaviSubRow & Add_SubRow(); - + DYN HF_NaviSubRow & Add_SubRow(); + private: - const ary::idl::CodeEntity * + const ary::idl::CodeEntity * pCe; }; - + extern const String C_sLocalManualLinks; diff --git a/autodoc/source/display/idl/hfi_property.cxx b/autodoc/source/display/idl/hfi_property.cxx index 4e7902a24810..4540d99daebb 100644 --- a/autodoc/source/display/idl/hfi_property.cxx +++ b/autodoc/source/display/idl/hfi_property.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 diff --git a/autodoc/source/display/idl/hfi_property.hxx b/autodoc/source/display/idl/hfi_property.hxx index 3c6da79fc61d..7c6a24004229 100644 --- a/autodoc/source/display/idl/hfi_property.hxx +++ b/autodoc/source/display/idl/hfi_property.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_service.cxx b/autodoc/source/display/idl/hfi_service.cxx index ad19d336e7f1..f78874020a1b 100644 --- a/autodoc/source/display/idl/hfi_service.cxx +++ b/autodoc/source/display/idl/hfi_service.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 @@ -129,7 +129,7 @@ HF_IdlService::produce_CommentedRelations( const client & i_ce, csv_assert( it_list ); bool bSummaryOnly = ( i_docType == doctype_summaryOnly ); - HF_SubTitleTable aTable( + HF_SubTitleTable aTable( CurOut(), bSummaryOnly ? i_summaryLabel : i_detailsLabel, bSummaryOnly ? i_summaryTitle : i_detailsTitle, diff --git a/autodoc/source/display/idl/hfi_service.hxx b/autodoc/source/display/idl/hfi_service.hxx index 95c6f4163548..9ca4530eefb2 100644 --- a/autodoc/source/display/idl/hfi_service.hxx +++ b/autodoc/source/display/idl/hfi_service.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_singleton.cxx b/autodoc/source/display/idl/hfi_singleton.cxx index 39daf4b927ee..04f87e78b8d9 100644 --- a/autodoc/source/display/idl/hfi_singleton.cxx +++ b/autodoc/source/display/idl/hfi_singleton.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 diff --git a/autodoc/source/display/idl/hfi_singleton.hxx b/autodoc/source/display/idl/hfi_singleton.hxx index 3d1ec1b5c2fd..2b1c28e63e61 100644 --- a/autodoc/source/display/idl/hfi_singleton.hxx +++ b/autodoc/source/display/idl/hfi_singleton.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_siservice.cxx b/autodoc/source/display/idl/hfi_siservice.cxx index 7e36c79e07c1..1a2c9fa7edfb 100644 --- a/autodoc/source/display/idl/hfi_siservice.cxx +++ b/autodoc/source/display/idl/hfi_siservice.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 diff --git a/autodoc/source/display/idl/hfi_siservice.hxx b/autodoc/source/display/idl/hfi_siservice.hxx index e1953a93a1ca..03fef81d2e06 100644 --- a/autodoc/source/display/idl/hfi_siservice.hxx +++ b/autodoc/source/display/idl/hfi_siservice.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_struct.cxx b/autodoc/source/display/idl/hfi_struct.cxx index ada9d7618ca2..37fab0fa2e75 100644 --- a/autodoc/source/display/idl/hfi_struct.cxx +++ b/autodoc/source/display/idl/hfi_struct.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 diff --git a/autodoc/source/display/idl/hfi_struct.hxx b/autodoc/source/display/idl/hfi_struct.hxx index 4c51a4c66c84..c56439fcf8d8 100644 --- a/autodoc/source/display/idl/hfi_struct.hxx +++ b/autodoc/source/display/idl/hfi_struct.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_tag.cxx b/autodoc/source/display/idl/hfi_tag.cxx index a2b97a4b41ff..b75e8683d07c 100644 --- a/autodoc/source/display/idl/hfi_tag.cxx +++ b/autodoc/source/display/idl/hfi_tag.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 diff --git a/autodoc/source/display/idl/hfi_tag.hxx b/autodoc/source/display/idl/hfi_tag.hxx index ed247bf27a4a..cde541eeed13 100644 --- a/autodoc/source/display/idl/hfi_tag.hxx +++ b/autodoc/source/display/idl/hfi_tag.hxx @@ -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 @@ -71,7 +71,7 @@ class HF_IdlDocuTextDisplay : public HtmlFactory_Idl, virtual void Display_TextToken( const csi::dsapi::DT_TextToken & i_rToken ); - virtual void Display_White(); + virtual void Display_White(); virtual void Display_MupType( const csi::dsapi::DT_MupType & @@ -155,7 +155,7 @@ class HF_IdlTag : public HtmlFactory_Idl, virtual void Display_ParameterAtTag( const csi::dsapi::DT_ParameterAtTag & i_rToken ); - virtual void Display_SinceAtTag( + virtual void Display_SinceAtTag( const csi::dsapi::DT_SinceAtTag & i_rToken ); diff --git a/autodoc/source/display/idl/hfi_typedef.cxx b/autodoc/source/display/idl/hfi_typedef.cxx index b1b717572b65..67bb685a9d00 100644 --- a/autodoc/source/display/idl/hfi_typedef.cxx +++ b/autodoc/source/display/idl/hfi_typedef.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 diff --git a/autodoc/source/display/idl/hfi_typedef.hxx b/autodoc/source/display/idl/hfi_typedef.hxx index 3ef08d494fe4..d1fcbb9dd1e5 100644 --- a/autodoc/source/display/idl/hfi_typedef.hxx +++ b/autodoc/source/display/idl/hfi_typedef.hxx @@ -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 @@ -46,7 +46,7 @@ class HF_IdlTypedef : public HtmlFactory_Idl Xml::Element & o_rOut ); virtual ~HF_IdlTypedef(); - void Produce_byData( + void Produce_byData( const client & ce ) const; private: void make_Navibar( diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx index 458f5d12ae02..fd96d0a89a0c 100644 --- a/autodoc/source/display/idl/hfi_typetext.cxx +++ b/autodoc/source/display/idl/hfi_typetext.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 diff --git a/autodoc/source/display/idl/hfi_typetext.hxx b/autodoc/source/display/idl/hfi_typetext.hxx index 6d8c690976af..e7ec21d639d8 100644 --- a/autodoc/source/display/idl/hfi_typetext.hxx +++ b/autodoc/source/display/idl/hfi_typetext.hxx @@ -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 diff --git a/autodoc/source/display/idl/hfi_xrefpage.cxx b/autodoc/source/display/idl/hfi_xrefpage.cxx index e067308295ca..4afea859db49 100644 --- a/autodoc/source/display/idl/hfi_xrefpage.cxx +++ b/autodoc/source/display/idl/hfi_xrefpage.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 diff --git a/autodoc/source/display/idl/hfi_xrefpage.hxx b/autodoc/source/display/idl/hfi_xrefpage.hxx index 34bde3af9722..0f0ca26c3998 100644 --- a/autodoc/source/display/idl/hfi_xrefpage.hxx +++ b/autodoc/source/display/idl/hfi_xrefpage.hxx @@ -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 diff --git a/autodoc/source/display/idl/hi_ary.cxx b/autodoc/source/display/idl/hi_ary.cxx index 855b9ede1536..fa789cac13c8 100644 --- a/autodoc/source/display/idl/hi_ary.cxx +++ b/autodoc/source/display/idl/hi_ary.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 @@ -54,7 +54,7 @@ AryAccess::types() const inline const ary::idl::Module * AryAccess::find_SubModule( const ary::idl::Module & i_parent, - const String & i_name ) const + const String & i_name ) const { ary::idl::Ce_id nModule = i_parent.Search_Name(i_name); diff --git a/autodoc/source/display/idl/hi_ary.hxx b/autodoc/source/display/idl/hi_ary.hxx index 21dc60454fd5..99ae6372f379 100644 --- a/autodoc/source/display/idl/hi_ary.hxx +++ b/autodoc/source/display/idl/hi_ary.hxx @@ -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 @@ -132,7 +132,7 @@ class AryAccess i_letter ) const; const ary::idl::CePilot & - Ces() const; + Ces() const; private: const ary::idl::Module * find_SubModule( diff --git a/autodoc/source/display/idl/hi_display.cxx b/autodoc/source/display/idl/hi_display.cxx index b3eaa76279d6..170450e92a72 100644 --- a/autodoc/source/display/idl/hi_display.cxx +++ b/autodoc/source/display/idl/hi_display.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 diff --git a/autodoc/source/display/idl/hi_env.cxx b/autodoc/source/display/idl/hi_env.cxx index db4589efbe43..668e85328f65 100644 --- a/autodoc/source/display/idl/hi_env.cxx +++ b/autodoc/source/display/idl/hi_env.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 diff --git a/autodoc/source/display/idl/hi_env.hxx b/autodoc/source/display/idl/hi_env.hxx index 675db9ab7ab6..a081e07fe974 100644 --- a/autodoc/source/display/idl/hi_env.hxx +++ b/autodoc/source/display/idl/hi_env.hxx @@ -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 @@ -108,13 +108,13 @@ class HtmlEnvironment_Idl { return false; } /// @return Holds only the current directory, not the current file. - output::Position & CurPosition() const { return aCurPosition; } + output::Position & CurPosition() const { return aCurPosition; } void Get_CurFilePath( StreamStr & o_buffer ) const { o_buffer << aCurPath; } const display::CorporateFrame & - Layout() const { return *pLayout; } + Layout() const { return *pLayout; } const LinkHelper & Linker() const { return *pLinker; } void Get_LinkTo( @@ -128,7 +128,7 @@ class HtmlEnvironment_Idl CurPageCe() const { return pCurPageCe; } // ACCESS - output::Tree & OutputTree() { return *pOutputTree; } + output::Tree & OutputTree() { return *pOutputTree; } private: // Local diff --git a/autodoc/source/display/idl/hi_factory.cxx b/autodoc/source/display/idl/hi_factory.cxx index d194d6015744..1e9c091b40c7 100644 --- a/autodoc/source/display/idl/hi_factory.cxx +++ b/autodoc/source/display/idl/hi_factory.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 diff --git a/autodoc/source/display/idl/hi_factory.hxx b/autodoc/source/display/idl/hi_factory.hxx index fff162e083f5..2ff41228149e 100644 --- a/autodoc/source/display/idl/hi_factory.hxx +++ b/autodoc/source/display/idl/hi_factory.hxx @@ -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 diff --git a/autodoc/source/display/idl/hi_linkhelper.cxx b/autodoc/source/display/idl/hi_linkhelper.cxx index 4d6ae7a735ad..4d5f5d9d13d4 100644 --- a/autodoc/source/display/idl/hi_linkhelper.cxx +++ b/autodoc/source/display/idl/hi_linkhelper.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 diff --git a/autodoc/source/display/idl/hi_linkhelper.hxx b/autodoc/source/display/idl/hi_linkhelper.hxx index 5ba31a85d884..c08be5519f70 100644 --- a/autodoc/source/display/idl/hi_linkhelper.hxx +++ b/autodoc/source/display/idl/hi_linkhelper.hxx @@ -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 @@ -31,7 +31,7 @@ // USED SERVICES - // BASE CLASSES + // BASE CLASSES // COMPONENTS // PARAMETERS #include "hi_ary.hxx" @@ -61,13 +61,13 @@ class LinkHelper { OutPosition ret1 = rEnv.OutputTree().IndexRoot(); return OutPosition( ret1, String(output::IndexFile_A()) ); } - - const ary::idl::Module * + + const ary::idl::Module * Search_CurModule() const; - const ary::idl::Module * + const ary::idl::Module * Search_Module( output::Node & i_node ) const; - + const CE * Search_CeFromType( ary::idl::Type_id i_type ) const; @@ -81,27 +81,27 @@ class LinkHelper OutPosition & i_ownerPos, const String & i_memberName ) const { Get_Link2Position(o_link, i_ownerPos); - o_link << "#" << i_memberName; } - const String & XrefsSuffix() const; - - private: + o_link << "#" << i_memberName; } + const String & XrefsSuffix() const; + + private: // DATA mutable HtmlEnvironment_Idl & rEnv; -}; +}; -inline const ary::idl::CodeEntity * +inline const ary::idl::CodeEntity * LinkHelper::Search_CeFromType( ary::idl::Type_id i_type ) const -{ +{ ary::idl::Ce_id nCe = rEnv.Data().CeFromType(i_type); if (nCe.IsValid()) return &rEnv.Data().Find_Ce(nCe); return 0; -} +} -String nameChainLinker( +String nameChainLinker( const char * i_levelName ); diff --git a/autodoc/source/display/idl/hi_main.cxx b/autodoc/source/display/idl/hi_main.cxx index f6b346fcdc15..4217c93bccd8 100644 --- a/autodoc/source/display/idl/hi_main.cxx +++ b/autodoc/source/display/idl/hi_main.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 @@ -313,7 +313,7 @@ MainDisplay_Idl::WriteGlobalIndices() Guard_CurFactoryPtr gFactory(pCurFactory,aFactory); aFactory.Produce_Page( ary::idl::alphabetical_index::E_Letter(*pLetter) ); - } // end for + } // end for } diff --git a/autodoc/source/display/idl/hi_main.hxx b/autodoc/source/display/idl/hi_main.hxx index a70daa4087a1..2e52def89e92 100644 --- a/autodoc/source/display/idl/hi_main.hxx +++ b/autodoc/source/display/idl/hi_main.hxx @@ -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 diff --git a/autodoc/source/display/inc/cfrstd.hxx b/autodoc/source/display/inc/cfrstd.hxx index dce0db3b886f..e2e0cd8777a4 100644 --- a/autodoc/source/display/inc/cfrstd.hxx +++ b/autodoc/source/display/inc/cfrstd.hxx @@ -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 @@ -66,7 +66,7 @@ class StdFrame : public display::CorporateFrame virtual void Set_SimpleLinks(); private: - String sDevelopersGuideHtmlRoot; + String sDevelopersGuideHtmlRoot; bool bSimpleLinks; }; diff --git a/autodoc/source/display/inc/html/chd_udk2.hxx b/autodoc/source/display/inc/html/chd_udk2.hxx index b8a17b999fb5..c7f0e50f4bd3 100644 --- a/autodoc/source/display/inc/html/chd_udk2.hxx +++ b/autodoc/source/display/inc/html/chd_udk2.hxx @@ -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 diff --git a/autodoc/source/display/inc/idl/hi_display.hxx b/autodoc/source/display/inc/idl/hi_display.hxx index 6fb4ca50ab38..aec860f7653e 100644 --- a/autodoc/source/display/inc/idl/hi_display.hxx +++ b/autodoc/source/display/inc/idl/hi_display.hxx @@ -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 diff --git a/autodoc/source/display/inc/toolkit/hf_docentry.hxx b/autodoc/source/display/inc/toolkit/hf_docentry.hxx index 028f47b68af1..174c71c8b6c8 100644 --- a/autodoc/source/display/inc/toolkit/hf_docentry.hxx +++ b/autodoc/source/display/inc/toolkit/hf_docentry.hxx @@ -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 diff --git a/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx index 013a8d2e123d..0ae73d75a2d5 100644 --- a/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx +++ b/autodoc/source/display/inc/toolkit/hf_funcdecl.hxx @@ -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 diff --git a/autodoc/source/display/inc/toolkit/hf_linachain.hxx b/autodoc/source/display/inc/toolkit/hf_linachain.hxx index 143e864c700e..08055f990ecd 100644 --- a/autodoc/source/display/inc/toolkit/hf_linachain.hxx +++ b/autodoc/source/display/inc/toolkit/hf_linachain.hxx @@ -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 diff --git a/autodoc/source/display/inc/toolkit/hf_navi_main.hxx b/autodoc/source/display/inc/toolkit/hf_navi_main.hxx index 0fbb726a4fcb..357031b54327 100644 --- a/autodoc/source/display/inc/toolkit/hf_navi_main.hxx +++ b/autodoc/source/display/inc/toolkit/hf_navi_main.hxx @@ -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 @@ -42,11 +42,11 @@ class HF_MainItem; /** @task - Create a HTML navigation bar with lightly coloured background. + Create a HTML navigation bar with lightly coloured background. @descr There are three kinds of items: - Item with link: Add_StdItem(), + Item with link: Add_StdItem(), Item without link: Add_NoneItem(), Item that is current page: Add_SelfItem(). */ diff --git a/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx b/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx index 24980ed666d8..d24bfeb358dc 100644 --- a/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx +++ b/autodoc/source/display/inc/toolkit/hf_navi_sub.hxx @@ -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 diff --git a/autodoc/source/display/inc/toolkit/hf_title.hxx b/autodoc/source/display/inc/toolkit/hf_title.hxx index d0045182ac85..36b51c91be05 100644 --- a/autodoc/source/display/inc/toolkit/hf_title.hxx +++ b/autodoc/source/display/inc/toolkit/hf_title.hxx @@ -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 diff --git a/autodoc/source/display/inc/toolkit/htmlfactory.hxx b/autodoc/source/display/inc/toolkit/htmlfactory.hxx index 4be72412832e..1ded98474454 100644 --- a/autodoc/source/display/inc/toolkit/htmlfactory.hxx +++ b/autodoc/source/display/inc/toolkit/htmlfactory.hxx @@ -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 diff --git a/autodoc/source/display/inc/toolkit/htmlfile.hxx b/autodoc/source/display/inc/toolkit/htmlfile.hxx index ae4f773e6680..5c096473ae76 100644 --- a/autodoc/source/display/inc/toolkit/htmlfile.hxx +++ b/autodoc/source/display/inc/toolkit/htmlfile.hxx @@ -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 @@ -49,7 +49,7 @@ class DocuFile_Html // LIFECYCLE DocuFile_Html(); - void SetLocation( + void SetLocation( const csv::ploc::Path & i_rFilePath ); void SetTitle( @@ -60,14 +60,14 @@ class DocuFile_Html const char * i_sCopyright ); void EmptyBody(); - Html::Body & Body() { return aBodyData; } - bool CreateFile(); + Html::Body & Body() { return aBodyData; } + bool CreateFile(); private: - void WriteHeader( - csv::File & io_aFile ); - void WriteBody( - csv::File & io_aFile ); + void WriteHeader( + csv::File & io_aFile ); + void WriteBody( + csv::File & io_aFile ); // DATA String sFilePath; String sTitle; @@ -76,7 +76,7 @@ class DocuFile_Html String sCssFile; String sCopyright; - Html::Body aBodyData; + Html::Body aBodyData; StreamStr aBuffer; }; diff --git a/autodoc/source/display/inc/toolkit/out_node.hxx b/autodoc/source/display/inc/toolkit/out_node.hxx index 1c837ec6b50f..558ab742f853 100644 --- a/autodoc/source/display/inc/toolkit/out_node.hxx +++ b/autodoc/source/display/inc/toolkit/out_node.hxx @@ -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 @@ -36,7 +36,7 @@ namespace output { -/** @resp +/** @resp Represents a tree of names where each node can have only one parent, but a list of children. diff --git a/autodoc/source/display/inc/toolkit/out_position.hxx b/autodoc/source/display/inc/toolkit/out_position.hxx index 0bc236cdf871..aefce4234e8a 100644 --- a/autodoc/source/display/inc/toolkit/out_position.hxx +++ b/autodoc/source/display/inc/toolkit/out_position.hxx @@ -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 diff --git a/autodoc/source/display/inc/toolkit/out_tree.hxx b/autodoc/source/display/inc/toolkit/out_tree.hxx index d04d51b780d4..1fc60374dd4c 100644 --- a/autodoc/source/display/inc/toolkit/out_tree.hxx +++ b/autodoc/source/display/inc/toolkit/out_tree.hxx @@ -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 @@ -57,42 +57,42 @@ class Tree // LIFECYCLE Tree(); ~Tree(); - - // OPERATIONS + + // OPERATIONS void Set_Overview( - const StringVector & + const StringVector & i_path, const String & i_sFileName ); Node & Set_NamesRoot( - const StringVector & + const StringVector & i_path ); Node & Set_IndexRoot( - const StringVector & + const StringVector & i_path ); Node & Set_ProjectsRoot( - const StringVector & + const StringVector & i_path ); Node & Provide_Node( - const StringVector & + const StringVector & i_path ); - + // ACCESS Node & RootNode() { return *pRoot; } - Node & NamesRootNode() { return *pNamesRoot; } - Node & IndexRootNode() { return *pIndexRoot; } - Node & ProjectsRootNode() { return *pProjectsRoot; } - + Node & NamesRootNode() { return *pNamesRoot; } + Node & IndexRootNode() { return *pIndexRoot; } + Node & ProjectsRootNode() { return *pProjectsRoot; } + Position Root() { return Position(*pRoot); } - Position Overview() { return aOverview; } - Position NamesRoot() { return Position(*pNamesRoot); } - Position IndexRoot() { return Position(*pIndexRoot); } - Position ProjectsRoot() { return Position(*pProjectsRoot); } + Position Overview() { return aOverview; } + Position NamesRoot() { return Position(*pNamesRoot); } + Position IndexRoot() { return Position(*pIndexRoot); } + Position ProjectsRoot() { return Position(*pProjectsRoot); } - private: + private: // forbidden: Tree(const Tree&); Tree & operator=(const Tree&); - + // DATA Dyn<Node> pRoot; Node * pNamesRoot; @@ -104,27 +104,27 @@ class Tree // IMPLEMENTATION -inline Node & +inline Node & Tree::Provide_Node( const StringVector & i_path ) { return pRoot->Provide_Child(i_path); } inline void Tree::Set_Overview( const StringVector & i_path, - const String & i_sFileName ) + const String & i_sFileName ) { aOverview.Set(Provide_Node(i_path), i_sFileName); } -inline Node & +inline Node & Tree::Set_NamesRoot( const StringVector & i_path ) { pNamesRoot = &Provide_Node(i_path); return *pNamesRoot; } - -inline Node & + +inline Node & Tree::Set_IndexRoot( const StringVector & i_path ) { pIndexRoot = &Provide_Node(i_path); return *pIndexRoot; } - -inline Node & + +inline Node & Tree::Set_ProjectsRoot( const StringVector & i_path ) { pProjectsRoot = &Provide_Node(i_path); return *pProjectsRoot; } diff --git a/autodoc/source/display/inc/toolkit/outputstack.hxx b/autodoc/source/display/inc/toolkit/outputstack.hxx index e874516ff157..d71cba3b2f79 100644 --- a/autodoc/source/display/inc/toolkit/outputstack.hxx +++ b/autodoc/source/display/inc/toolkit/outputstack.hxx @@ -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 diff --git a/autodoc/source/display/kernel/displfct.cxx b/autodoc/source/display/kernel/displfct.cxx index 4e2973d4c359..81ea5566fc73 100644 --- a/autodoc/source/display/kernel/displfct.cxx +++ b/autodoc/source/display/kernel/displfct.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 @@ -64,7 +64,7 @@ DisplayToolsFactory::~DisplayToolsFactory() // DYN autodoc::TextDisplay_FunctionList_Ifc * // DisplayToolsFactory::Create_TextDisplay_FunctionList() const // { -// return new CppTextDisplay_FunctionList; +// return new CppTextDisplay_FunctionList; // } diff --git a/autodoc/source/display/kernel/displfct.hxx b/autodoc/source/display/kernel/displfct.hxx index cd0274078162..b0854912c4ec 100644 --- a/autodoc/source/display/kernel/displfct.hxx +++ b/autodoc/source/display/kernel/displfct.hxx @@ -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 @@ -40,7 +40,7 @@ class DisplayToolsFactory : public autodoc::DisplayToolsFactory_Ifc { public: DisplayToolsFactory(); - virtual ~DisplayToolsFactory(); + virtual ~DisplayToolsFactory(); // virtual DYN autodoc::TextDisplay_FunctionList_Ifc * // Create_TextDisplay_FunctionList() const; diff --git a/autodoc/source/display/toolkit/hf_docentry.cxx b/autodoc/source/display/toolkit/hf_docentry.cxx index 961ee34ebee3..7e5ae4587b36 100644 --- a/autodoc/source/display/toolkit/hf_docentry.cxx +++ b/autodoc/source/display/toolkit/hf_docentry.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 diff --git a/autodoc/source/display/toolkit/hf_funcdecl.cxx b/autodoc/source/display/toolkit/hf_funcdecl.cxx index 4f0c652b1934..4ef1d5455b5b 100644 --- a/autodoc/source/display/toolkit/hf_funcdecl.cxx +++ b/autodoc/source/display/toolkit/hf_funcdecl.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 diff --git a/autodoc/source/display/toolkit/hf_linachain.cxx b/autodoc/source/display/toolkit/hf_linachain.cxx index 1d603d0a4b93..c4bba8e47eba 100644 --- a/autodoc/source/display/toolkit/hf_linachain.cxx +++ b/autodoc/source/display/toolkit/hf_linachain.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 diff --git a/autodoc/source/display/toolkit/hf_navi_main.cxx b/autodoc/source/display/toolkit/hf_navi_main.cxx index ab378a153bca..de5fca30081f 100644 --- a/autodoc/source/display/toolkit/hf_navi_main.cxx +++ b/autodoc/source/display/toolkit/hf_navi_main.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 @@ -113,10 +113,10 @@ HF_NaviMainRow::HF_NaviMainRow( Xml::Element & o_out ) { aItems.reserve(5); - pRow = + pRow = &( CurOut() >> *new Html::Table - << new Html::ClassAttr("navimain") + << new Html::ClassAttr("navimain") << new Xml::AnAttribute( "border", "0" ) << new Xml::AnAttribute( "cellpadding", "3" ) >> *new Html::TableRow diff --git a/autodoc/source/display/toolkit/hf_navi_sub.cxx b/autodoc/source/display/toolkit/hf_navi_sub.cxx index c983ddfe69ca..2b9758f1e2bb 100644 --- a/autodoc/source/display/toolkit/hf_navi_sub.cxx +++ b/autodoc/source/display/toolkit/hf_navi_sub.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 @@ -68,7 +68,7 @@ HF_NaviSubRow::Setup_Row() pTable = new Html::Table; CurOut() >> *pTable - << new Html::ClassAttr("navisub") + << new Html::ClassAttr("navisub") << new Xml::AnAttribute( "border", "0" ) << new Xml::AnAttribute( "cellpadding", "0" ); pMyRow = &pTable->AddRow(); diff --git a/autodoc/source/display/toolkit/hf_title.cxx b/autodoc/source/display/toolkit/hf_title.cxx index e68f7a1afb21..4341595f1b2d 100644 --- a/autodoc/source/display/toolkit/hf_title.cxx +++ b/autodoc/source/display/toolkit/hf_title.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 diff --git a/autodoc/source/display/toolkit/htmlfile.cxx b/autodoc/source/display/toolkit/htmlfile.cxx index f0387f485492..6d91f9d0ed63 100644 --- a/autodoc/source/display/toolkit/htmlfile.cxx +++ b/autodoc/source/display/toolkit/htmlfile.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 diff --git a/autodoc/source/display/toolkit/out_node.cxx b/autodoc/source/display/toolkit/out_node.cxx index fb6dc1980a06..ad6a7f07055c 100644 --- a/autodoc/source/display/toolkit/out_node.cxx +++ b/autodoc/source/display/toolkit/out_node.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 diff --git a/autodoc/source/display/toolkit/out_position.cxx b/autodoc/source/display/toolkit/out_position.cxx index efb4495fb0b4..6753976e04e6 100644 --- a/autodoc/source/display/toolkit/out_position.cxx +++ b/autodoc/source/display/toolkit/out_position.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 @@ -44,8 +44,8 @@ namespace const int C_nAssumedMaxLinkLength = 500; -void move_ToParent( - Node * & io_node, +void move_ToParent( + Node * & io_node, intt i_levels = 1 ); void diff --git a/autodoc/source/display/toolkit/out_tree.cxx b/autodoc/source/display/toolkit/out_tree.cxx index b0330671bd27..ebe1228b6bd7 100644 --- a/autodoc/source/display/toolkit/out_tree.cxx +++ b/autodoc/source/display/toolkit/out_tree.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,11 +43,11 @@ Tree::Tree() pProjectsRoot(pRoot.Ptr()), aOverview() { -} +} Tree::~Tree() -{ -} +{ +} diff --git a/autodoc/source/display/toolkit/outputstack.cxx b/autodoc/source/display/toolkit/outputstack.cxx index 296e77b412f8..074c385d31ce 100644 --- a/autodoc/source/display/toolkit/outputstack.cxx +++ b/autodoc/source/display/toolkit/outputstack.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 diff --git a/autodoc/source/exes/adc_uni/adc_cl.cxx b/autodoc/source/exes/adc_uni/adc_cl.cxx index 45c98b7c7548..9c6aa56ee8dc 100644 --- a/autodoc/source/exes/adc_uni/adc_cl.cxx +++ b/autodoc/source/exes/adc_uni/adc_cl.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 diff --git a/autodoc/source/exes/adc_uni/adc_cmd.hxx b/autodoc/source/exes/adc_uni/adc_cmd.hxx index 47e5ab7edfe0..72e75ff8091c 100644 --- a/autodoc/source/exes/adc_uni/adc_cmd.hxx +++ b/autodoc/source/exes/adc_uni/adc_cmd.hxx @@ -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 diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx index 88861f87ca2d..2ce39cb14a2e 100644 --- a/autodoc/source/exes/adc_uni/adc_cmd_parse.cxx +++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.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 diff --git a/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx b/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx index dc78f3d4a2fd..0f15f49a0372 100644 --- a/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx +++ b/autodoc/source/exes/adc_uni/adc_cmd_parse.hxx @@ -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 diff --git a/autodoc/source/exes/adc_uni/adc_cmds.cxx b/autodoc/source/exes/adc_uni/adc_cmds.cxx index 93f54a52ce6a..c54adea084ea 100644 --- a/autodoc/source/exes/adc_uni/adc_cmds.cxx +++ b/autodoc/source/exes/adc_uni/adc_cmds.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 diff --git a/autodoc/source/exes/adc_uni/adc_cmds.hxx b/autodoc/source/exes/adc_uni/adc_cmds.hxx index 461bbcbbbeec..784a50402a4b 100644 --- a/autodoc/source/exes/adc_uni/adc_cmds.hxx +++ b/autodoc/source/exes/adc_uni/adc_cmds.hxx @@ -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 diff --git a/autodoc/source/exes/adc_uni/adc_msg.cxx b/autodoc/source/exes/adc_uni/adc_msg.cxx index ad8b9d5745f0..15f8377fb53a 100644 --- a/autodoc/source/exes/adc_uni/adc_msg.cxx +++ b/autodoc/source/exes/adc_uni/adc_msg.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 diff --git a/autodoc/source/exes/adc_uni/cmd_run.cxx b/autodoc/source/exes/adc_uni/cmd_run.cxx index 5b79de482114..24eb9f40c746 100644 --- a/autodoc/source/exes/adc_uni/cmd_run.cxx +++ b/autodoc/source/exes/adc_uni/cmd_run.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 @@ -115,7 +115,7 @@ Parser::Perform() Cerr() << "Project in yet unimplemented language skipped." << Endl(); } - } // end for + } // end for if (bCpp) { @@ -140,7 +140,7 @@ Parser::Perform() // if ( aFile.open() ) // { // rIdl2sPilot.Read_Links2DevManual(aFile); -// aFile.close(); +// aFile.close(); // } // } } // endif (bIDL) diff --git a/autodoc/source/exes/adc_uni/cmd_run.hxx b/autodoc/source/exes/adc_uni/cmd_run.hxx index 523df6eb34dc..c316037af492 100644 --- a/autodoc/source/exes/adc_uni/cmd_run.hxx +++ b/autodoc/source/exes/adc_uni/cmd_run.hxx @@ -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 diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx b/autodoc/source/exes/adc_uni/cmd_sincedata.cxx index ca3ac084d00e..bb21028e6f21 100644 --- a/autodoc/source/exes/adc_uni/cmd_sincedata.cxx +++ b/autodoc/source/exes/adc_uni/cmd_sincedata.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 diff --git a/autodoc/source/exes/adc_uni/cmd_sincedata.hxx b/autodoc/source/exes/adc_uni/cmd_sincedata.hxx index adac72c93594..f6bb5cac2694 100644 --- a/autodoc/source/exes/adc_uni/cmd_sincedata.hxx +++ b/autodoc/source/exes/adc_uni/cmd_sincedata.hxx @@ -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 diff --git a/autodoc/source/exes/adc_uni/main.cxx b/autodoc/source/exes/adc_uni/main.cxx index 6e5a11a6e0b6..f0f0b89d34a4 100644 --- a/autodoc/source/exes/adc_uni/main.cxx +++ b/autodoc/source/exes/adc_uni/main.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 diff --git a/autodoc/source/inc/adc_cl.hxx b/autodoc/source/inc/adc_cl.hxx index 07fff0a9d940..b7820eae745f 100644 --- a/autodoc/source/inc/adc_cl.hxx +++ b/autodoc/source/inc/adc_cl.hxx @@ -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 diff --git a/autodoc/source/inc/adc_msg.hxx b/autodoc/source/inc/adc_msg.hxx index e88ccf5ce526..8562056eea99 100644 --- a/autodoc/source/inc/adc_msg.hxx +++ b/autodoc/source/inc/adc_msg.hxx @@ -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 diff --git a/autodoc/source/inc/docu_node_ids.hxx b/autodoc/source/inc/docu_node_ids.hxx index 95f8e20dcebf..474a9aa67354 100644 --- a/autodoc/source/inc/docu_node_ids.hxx +++ b/autodoc/source/inc/docu_node_ids.hxx @@ -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 diff --git a/autodoc/source/inc/estack.hxx b/autodoc/source/inc/estack.hxx index 5c1b76ab7446..b9607fe1cd08 100644 --- a/autodoc/source/inc/estack.hxx +++ b/autodoc/source/inc/estack.hxx @@ -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 @@ -52,11 +52,11 @@ class EStack : private std::slist<ELEM> typedef typename std::slist<ELEM>::size_type size_type; // LIFECYCLE - EStack() {} + EStack() {} EStack( const EStack & i_rStack ) - : base( (const base &)(i_rStack) ) {} - ~EStack() {} + : base( (const base &)(i_rStack) ) {} + ~EStack() {} // OPERATORS EStack & operator=( const EStack & i_rStack ) diff --git a/autodoc/source/inc/luxenum.hxx b/autodoc/source/inc/luxenum.hxx index 5cac60403b56..e75d6a3fc591 100644 --- a/autodoc/source/inc/luxenum.hxx +++ b/autodoc/source/inc/luxenum.hxx @@ -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 @@ -50,50 +50,50 @@ class Enum // : public Template_Base { public: // TYPES - typedef Enum< DIFF > self; + typedef Enum< DIFF > self; // LIFECYCLE Enum( - DIFF i_nValue, - const char * i_sText ) - : nValue(i_nValue) { Values_()[nValue] = i_sText; + DIFF i_nValue, + const char * i_sText ) + : nValue(i_nValue) { Values_()[nValue] = i_sText; // Sequence_().insert( - // std::lower_bound( Sequence_().begin(), Sequence_().end(), i_nValue ), - // i_nValue ); + // std::lower_bound( Sequence_().begin(), Sequence_().end(), i_nValue ), + // i_nValue ); } Enum( - DIFF i_nValue ) - : nValue(i_nValue) { ; } + DIFF i_nValue ) + : nValue(i_nValue) { ; } Enum( - intt i_nValue = 0 ) - : nValue(i_nValue) { if ( NOT CheckIntt(i_nValue) ) { csv_assert(false); } } + intt i_nValue = 0 ) + : nValue(i_nValue) { if ( NOT CheckIntt(i_nValue) ) { csv_assert(false); } } Enum( - const self & i_rEnum ) - : nValue(i_rEnum.nValue) {;} + const self & i_rEnum ) + : nValue(i_rEnum.nValue) {;} - self & operator=( - DIFF i_nValue ) + self & operator=( + DIFF i_nValue ) { nValue = i_nValue; return *this; } - self & operator=( - intt i_nValue ) + self & operator=( + intt i_nValue ) { if ( CheckIntt(i_nValue) ) {nValue = DIFF(i_nValue);} else {csv_assert(false);} return *this; } - self & operator=( - const self & i_rEnum ) + self & operator=( + const self & i_rEnum ) { nValue = i_rEnum.nValue; return *this; } - operator DIFF() const { return DIFF(nValue); } + operator DIFF() const { return DIFF(nValue); } - DIFF operator()() const { return nValue; } - const String & Text() const { return Values_()[nValue]; } + DIFF operator()() const { return nValue; } + const String & Text() const { return Values_()[nValue]; } private: static EnumValueMap & Values_(); - bool CheckIntt( - intt i_nNumber ) + bool CheckIntt( + intt i_nNumber ) { return Values_().find(i_nNumber) != Values_().end(); } // DATA - intt nValue; + intt nValue; }; diff --git a/autodoc/source/inc/manip.hxx b/autodoc/source/inc/manip.hxx index cd07815d3fd9..b74bdbf7adfd 100644 --- a/autodoc/source/inc/manip.hxx +++ b/autodoc/source/inc/manip.hxx @@ -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 diff --git a/autodoc/source/inc/precomp.h b/autodoc/source/inc/precomp.h index 9519999f22c4..c7cdb20ad57e 100644 --- a/autodoc/source/inc/precomp.h +++ b/autodoc/source/inc/precomp.h @@ -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 diff --git a/autodoc/source/inc/prprpr.hxx b/autodoc/source/inc/prprpr.hxx index eafc28fff86f..ba1c1fdbff6c 100644 --- a/autodoc/source/inc/prprpr.hxx +++ b/autodoc/source/inc/prprpr.hxx @@ -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 diff --git a/autodoc/source/inc/tools/filecoll.hxx b/autodoc/source/inc/tools/filecoll.hxx index c30f864a242f..89756c524586 100644 --- a/autodoc/source/inc/tools/filecoll.hxx +++ b/autodoc/source/inc/tools/filecoll.hxx @@ -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 @@ -42,15 +42,15 @@ class FileCollector : public autodoc::FileCollector_Ifc public: // LIFECYCLE FileCollector( - uintt i_nRoughNrOfFiles = 0 ); + uintt i_nRoughNrOfFiles = 0 ); // OPERATIONS virtual uintt AddFilesFrom( - const char * i_sRootDir, - const char * i_sFilter, - E_SearchMode i_eSearchMode ); + const char * i_sRootDir, + const char * i_sFilter, + E_SearchMode i_eSearchMode ); virtual uintt AddFile( - const char * i_sFilePath ); + const char * i_sFilePath ); virtual void EraseAll(); // INQUIRY diff --git a/autodoc/source/inc/tools/tkpchars.hxx b/autodoc/source/inc/tools/tkpchars.hxx index 780352b888b3..a1aa7970d238 100644 --- a/autodoc/source/inc/tools/tkpchars.hxx +++ b/autodoc/source/inc/tools/tkpchars.hxx @@ -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 @@ -38,7 +38,7 @@ -/** @descr +/** @descr dpSource: @@ -54,7 +54,7 @@ c := The current cursor position. - @needs cosv.lib + @needs cosv.lib @use This class can be used by any parser to get the chars of a text one by one and separate them to tokens. @@ -72,13 +72,13 @@ class CharacterSource If in_rSource is a file, it has to be open of course. After loading the text, the CurChar() is set on the begin of the text. **/ - void LoadText( - csv::bstream & io_rSource); + void LoadText( + csv::bstream & io_rSource); void InsertTextAtCurPos( const char * i_sText2Insert ); - /// @return CurChar() after moving forward one char. + /// @return CurChar() after moving forward one char. char MoveOn(); /** @return The token which starts at the char which was CurChar(), when @@ -87,52 +87,52 @@ class CharacterSource Value is valid until the next call of CutToken() or ~CharacterSource(). **/ - const char * CutToken(); + const char * CutToken(); // INQUIRY char CurChar() const; /// @return The result of the last CutToken(). Or NULL, if there was none yet. - const char * CurToken() const; + const char * CurToken() const; // INQUIRY /// @return true, if - bool IsFinished() const; + bool IsFinished() const; private: struct S_SourceState { - DYN char * dpSource; - intt nSourceSize; + DYN char * dpSource; + intt nSourceSize; - intt nCurPos; - intt nLastCut; - intt nLastTokenStart; - char cCharAtLastCut; + intt nCurPos; + intt nLastCut; + intt nLastTokenStart; + char cCharAtLastCut; S_SourceState( - DYN char * dpSource, - intt nSourceSize, - intt nCurPos, - intt nLastCut, - intt nLastTokenStart, - char cCharAtLastCut ); + DYN char * dpSource, + intt nSourceSize, + intt nCurPos, + intt nLastCut, + intt nLastTokenStart, + char cCharAtLastCut ); }; void BeginSource(); - intt CurPos() const; + intt CurPos() const; char MoveOn_OverStack(); // DATA std::stack< S_SourceState > aSourcesStack; - DYN char * dpSource; - intt nSourceSize; + DYN char * dpSource; + intt nSourceSize; - intt nCurPos; - intt nLastCut; - intt nLastTokenStart; - char cCharAtLastCut; + intt nCurPos; + intt nLastCut; + intt nLastTokenStart; + char cCharAtLastCut; }; diff --git a/autodoc/source/parser/adoc/a_rdocu.cxx b/autodoc/source/parser/adoc/a_rdocu.cxx index 212541a2f535..016de5536072 100644 --- a/autodoc/source/parser/adoc/a_rdocu.cxx +++ b/autodoc/source/parser/adoc/a_rdocu.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 @@ namespace adoc DocuExplorer::DocuExplorer() - : pDocuDistributor(0), + : pDocuDistributor(0), pPE(new Adoc_PE), bIsPassedFirstDocu(false) { diff --git a/autodoc/source/parser/adoc/adoc_tok.cxx b/autodoc/source/parser/adoc/adoc_tok.cxx index 4a63c2d0dc8f..e2cca6e69b3a 100644 --- a/autodoc/source/parser/adoc/adoc_tok.cxx +++ b/autodoc/source/parser/adoc/adoc_tok.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 diff --git a/autodoc/source/parser/adoc/cx_a_std.cxx b/autodoc/source/parser/adoc/cx_a_std.cxx index 18d11b560ab0..974218d94992 100644 --- a/autodoc/source/parser/adoc/cx_a_std.cxx +++ b/autodoc/source/parser/adoc/cx_a_std.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 @@ -110,7 +110,7 @@ DYN TextToken * TCF_Eof(const char *) { return new Tok_Eof; } Context_AdocStd::Context_AdocStd() - : aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati), + : aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati), pDealer(0), pParentContext(0), pFollowUpContext(0), @@ -158,7 +158,7 @@ Context_AdocStd::ReadCharChain( CharacterSource & io_rText ) StmBoundsStatus & rBound = aStateMachine.GetCharChain(fTokenCreateFunction, io_rText); // !!! - // The order of the next two lines is essential, because + // The order of the next two lines is essential, because // pFollowUpContext may be changed by PerformStatusFunction() also, // which then MUST override the previous assignment. pFollowUpContext = rBound.FollowUpContext(); @@ -184,9 +184,9 @@ Context_AdocStd::FollowUpContext() } void -Context_AdocStd::PerformStatusFunction( uintt i_nStatusSignal, - F_CRTOK i_fTokenCreateFunction, - CharacterSource & io_rText ) +Context_AdocStd::PerformStatusFunction( uintt i_nStatusSignal, + F_CRTOK i_fTokenCreateFunction, + CharacterSource & io_rText ) { switch (i_nStatusSignal) { @@ -195,7 +195,7 @@ Context_AdocStd::PerformStatusFunction( uintt i_nStatusSignal, char cCC = io_rText.CurChar(); String sChar( &cCC, 1 ); throw X_Parser(X_Parser::x_InvalidChar, sChar, String ::Null_(), 0); - } // no break, because of throw + } // no break, because of throw case nF_fin_Ignore: io_rText.CutToken(); pNewToken = 0; @@ -244,24 +244,24 @@ Context_AdocStd::PerformStatusFunction( uintt i_nStatusSignal, String sChar( &cCC, 1 ); throw X_Parser(X_Parser::x_InvalidChar, sChar, String::Null_(), 0); } - } // end switch (i_nStatusSignal) + } // end switch (i_nStatusSignal) } void Context_AdocStd::SetupStateMachine() { // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel): -// const INT16 bas = 0; // Base-Status - const INT16 wht = 1; // Whitespace-Status - const INT16 awd = 2; // Any-Word-Read-Status +// const INT16 bas = 0; // Base-Status + const INT16 wht = 1; // Whitespace-Status + const INT16 awd = 2; // Any-Word-Read-Status // Kontextwechsel-Stati: - const INT16 goto_CheckStar = 3; + const INT16 goto_CheckStar = 3; const INT16 goto_AtTag = 4; // Tokenfinish-Stati: const INT16 finError = 5; -// const INT16 finIgnore = 6; +// const INT16 finIgnore = 6; const INT16 finEol = 7; const INT16 finEof = 8; const INT16 finAnyWord = 9; @@ -271,13 +271,13 @@ Context_AdocStd::SetupStateMachine() const INT16 fof = finEof; const INT16 err = finError; const INT16 faw = finAnyWord; -// const INT16 fig = finIgnore; +// const INT16 fig = finIgnore; const INT16 fwh = finWhitespace; /// The '0's will be replaced by calls of AddToken(). const INT16 A_nTopStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fof,err,err,err,err,err,err,err,err,wht, 0,wht,wht, 0,err,err, err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31 wht,awd,awd,awd,awd,awd,awd,awd,awd,awd, 0,awd,awd,awd,awd,awd, @@ -289,7 +289,7 @@ Context_AdocStd::SetupStateMachine() }; const INT16 A_nWhitespaceStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fof,err,err,err,err,err,err,err,err,wht,fwh,wht,wht,fwh,err,err, err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31 wht,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh,fwh, @@ -301,7 +301,7 @@ Context_AdocStd::SetupStateMachine() }; const INT16 A_nWordStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err, err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31 faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd, @@ -313,7 +313,7 @@ Context_AdocStd::SetupStateMachine() }; const INT16 A_nAtTagDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err, err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31 faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd, @@ -325,7 +325,7 @@ Context_AdocStd::SetupStateMachine() }; const INT16 A_nPunctDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ... err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, @@ -343,22 +343,22 @@ Context_AdocStd::SetupStateMachine() DYN StmArrayStatus * dpStatusWord = new StmArrayStatus( C_nStatusSize, A_nWordStatus, TCF_DocWord, true); - DYN StmBoundsStatus * dpBst_goto_CheckStar + DYN StmBoundsStatus * dpBst_goto_CheckStar = new StmBoundsStatus( *this, *pCx_CheckStar, nF_goto_CheckStar, true ); - DYN StmBoundsStatus * dpBst_goto_AtTag + DYN StmBoundsStatus * dpBst_goto_AtTag = new StmBoundsStatus( *this, *pCx_AtTagCompletion, nF_goto_AtTag, true ); - DYN StmBoundsStatus * dpBst_finError + DYN StmBoundsStatus * dpBst_finError = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_Error, true ); - DYN StmBoundsStatus * dpBst_finIgnore + DYN StmBoundsStatus * dpBst_finIgnore = new StmBoundsStatus( *this, *this, nF_fin_Ignore, true); - DYN StmBoundsStatus * dpBst_finEol + DYN StmBoundsStatus * dpBst_finEol = new StmBoundsStatus( *this, *pCx_LineStart, nF_fin_Eol, false); - DYN StmBoundsStatus * dpBst_finEof + DYN StmBoundsStatus * dpBst_finEof = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_Eof, false); - DYN StmBoundsStatus * dpBst_finAnyWord + DYN StmBoundsStatus * dpBst_finAnyWord = new StmBoundsStatus( *this, *this, nF_fin_AnyWord, true); - DYN StmBoundsStatus * dpBst_finWhitespace + DYN StmBoundsStatus * dpBst_finWhitespace = new StmBoundsStatus( *this, *this, nF_fin_Whitespace, true); // dpMain aufbauen: @@ -376,77 +376,77 @@ Context_AdocStd::SetupStateMachine() aStateMachine.AddStatus(dpBst_finAnyWord); aStateMachine.AddStatus(dpBst_finWhitespace); - aStateMachine.AddToken( "*", 0, A_nPunctDefStatus, goto_CheckStar ); - aStateMachine.AddToken( "@ATT", TCF_atstd_ATT, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@att", TCF_atstd_ATT, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "*", 0, A_nPunctDefStatus, goto_CheckStar ); + aStateMachine.AddToken( "@ATT", TCF_atstd_ATT, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@att", TCF_atstd_ATT, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@ATTENTION", - TCF_atstd_ATT, A_nAtTagDefStatus, goto_AtTag ); + TCF_atstd_ATT, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@attention", - TCF_atstd_ATT, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@author", TCF_atstd_author, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@change", TCF_atstd_change, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@collab", TCF_atstd_collab, A_nAtTagDefStatus, goto_AtTag ); + TCF_atstd_ATT, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@author", TCF_atstd_author, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@change", TCF_atstd_change, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@collab", TCF_atstd_collab, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@collaborator", - TCF_atstd_collab, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@contact", TCF_atstd_contact, A_nAtTagDefStatus, goto_AtTag ); + TCF_atstd_collab, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@contact", TCF_atstd_contact, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@copyright",TCF_atstd_copyright, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@descr", TCF_atstd_descr, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@docdate", TCF_atstd_docdate, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@derive", TCF_atstd_derive, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@descr", TCF_atstd_descr, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@docdate", TCF_atstd_docdate, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@derive", TCF_atstd_derive, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@instance",TCF_atstd_instance, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@life", TCF_atstd_life, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@life", TCF_atstd_life, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@lifecycle", TCF_atstd_life, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@multi", TCF_atstd_multi, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@multi", TCF_atstd_multi, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@multiplicity", TCF_atstd_multi, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@onerror", TCF_atstd_onerror, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@persist", TCF_atstd_persist, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@onerror", TCF_atstd_onerror, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@persist", TCF_atstd_persist, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@postcond",TCF_atstd_postcond,A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@precond", TCF_atstd_precond, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@resp", TCF_atstd_responsibility, + aStateMachine.AddToken( "@precond", TCF_atstd_precond, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@resp", TCF_atstd_responsibility, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@responsibility", TCF_atstd_return, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@return", TCF_atstd_return, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@short", TCF_atstd_short, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@todo", TCF_atstd_todo, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@version", TCF_atstd_version, A_nAtTagDefStatus, goto_AtTag ); - - aStateMachine.AddToken( "@base", TCF_at_base, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@exception",TCF_at_exception, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@impl", TCF_at_impl, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@key", TCF_at_key, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@param", TCF_at_param, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@see", TCF_at_see, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@seealso", TCF_at_see, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@since", TCF_at_since, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@tpl", TCF_at_template, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@return", TCF_atstd_return, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@short", TCF_atstd_short, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@todo", TCF_atstd_todo, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@version", TCF_atstd_version, A_nAtTagDefStatus, goto_AtTag ); + + aStateMachine.AddToken( "@base", TCF_at_base, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@exception",TCF_at_exception, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@impl", TCF_at_impl, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@key", TCF_at_key, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@param", TCF_at_param, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@see", TCF_at_see, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@seealso", TCF_at_see, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@since", TCF_at_since, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@tpl", TCF_at_template, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@tplparam", - TCF_at_template, A_nAtTagDefStatus, goto_AtTag ); + TCF_at_template, A_nAtTagDefStatus, goto_AtTag ); aStateMachine.AddToken( "@interface",TCF_at_interface, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@internal",TCF_at_internal, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@obsolete",TCF_at_obsolete, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@deprecated",TCF_at_obsolete, A_nAtTagDefStatus, goto_AtTag ); - - aStateMachine.AddToken( "@module", TCF_at_module, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@file", TCF_at_file, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@gloss", TCF_at_gloss, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@global#", TCF_at_global, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@include#",TCF_at_include, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@#", TCF_at_label, A_nAtTagDefStatus, goto_AtTag ); - - aStateMachine.AddToken( "@HTML", TCF_at_HTML, A_nAtTagDefStatus, goto_AtTag ); - aStateMachine.AddToken( "@NOHTML", TCF_at_NOHTML, A_nAtTagDefStatus, goto_AtTag ); - - aStateMachine.AddToken( "\r\n", 0, A_nPunctDefStatus, finEol ); - aStateMachine.AddToken( "\n", 0, A_nPunctDefStatus, finEol ); - aStateMachine.AddToken( "\r", 0, A_nPunctDefStatus, finEol ); + aStateMachine.AddToken( "@internal",TCF_at_internal, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@obsolete",TCF_at_obsolete, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@deprecated",TCF_at_obsolete, A_nAtTagDefStatus, goto_AtTag ); + + aStateMachine.AddToken( "@module", TCF_at_module, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@file", TCF_at_file, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@gloss", TCF_at_gloss, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@global#", TCF_at_global, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@include#",TCF_at_include, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@#", TCF_at_label, A_nAtTagDefStatus, goto_AtTag ); + + aStateMachine.AddToken( "@HTML", TCF_at_HTML, A_nAtTagDefStatus, goto_AtTag ); + aStateMachine.AddToken( "@NOHTML", TCF_at_NOHTML, A_nAtTagDefStatus, goto_AtTag ); + + aStateMachine.AddToken( "\r\n", 0, A_nPunctDefStatus, finEol ); + aStateMachine.AddToken( "\n", 0, A_nPunctDefStatus, finEol ); + aStateMachine.AddToken( "\r", 0, A_nPunctDefStatus, finEol ); }; void -Context_AdocStd::SetMode_IsMultiLine( bool i_bTrue ) +Context_AdocStd::SetMode_IsMultiLine( bool i_bTrue ) { bIsMultiline = i_bTrue; } diff --git a/autodoc/source/parser/adoc/cx_a_sub.cxx b/autodoc/source/parser/adoc/cx_a_sub.cxx index 335e2adbc6a1..03c6b8a4f375 100644 --- a/autodoc/source/parser/adoc/cx_a_sub.cxx +++ b/autodoc/source/parser/adoc/cx_a_sub.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 @@ -38,10 +38,10 @@ namespace adoc { -//************************ Cx_LineStart ************************// +//************************ Cx_LineStart ************************// -Cx_LineStart::Cx_LineStart( TkpContext & i_rFollowUpContext ) - : pDealer(0), +Cx_LineStart::Cx_LineStart( TkpContext & i_rFollowUpContext ) + : pDealer(0), pFollowUpContext(&i_rFollowUpContext) { } @@ -83,10 +83,10 @@ Cx_LineStart::FollowUpContext() } -//************************ Cx_CheckStar ************************// +//************************ Cx_CheckStar ************************// -Cx_CheckStar::Cx_CheckStar( TkpContext & i_rFollowUpContext ) - : pDealer(0), +Cx_CheckStar::Cx_CheckStar( TkpContext & i_rFollowUpContext ) + : pDealer(0), pFollowUpContext(&i_rFollowUpContext), pEnd_FollowUpContext(0), bCanBeEnd(false), @@ -143,10 +143,10 @@ Cx_CheckStar::FollowUpContext() } -//************************ Cx_AtTagCompletion ************************// +//************************ Cx_AtTagCompletion ************************// -Cx_AtTagCompletion::Cx_AtTagCompletion( TkpContext & i_rFollowUpContext ) - : pDealer(0), +Cx_AtTagCompletion::Cx_AtTagCompletion( TkpContext & i_rFollowUpContext ) + : pDealer(0), pFollowUpContext(&i_rFollowUpContext) { } diff --git a/autodoc/source/parser/adoc/docu_pe.cxx b/autodoc/source/parser/adoc/docu_pe.cxx index d54e0295f38e..78b0ab86a573 100644 --- a/autodoc/source/parser/adoc/docu_pe.cxx +++ b/autodoc/source/parser/adoc/docu_pe.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 @@ -53,7 +53,7 @@ Adoc_PE::UsesHtmlInDocuText() Adoc_PE::Adoc_PE() - : pCurDocu(0), + : pCurDocu(0), pCurAtTag(0), nLineCountInDocu(0), nCurSpecialMeaningTokens(0), @@ -70,7 +70,7 @@ Adoc_PE::~Adoc_PE() } void -Adoc_PE::Hdl_at_std( const Tok_at_std & i_rTok ) +Adoc_PE::Hdl_at_std( const Tok_at_std & i_rTok ) { InstallAtTag( CurDocu().Create_StdTag(i_rTok.Id()) ); @@ -98,7 +98,7 @@ Adoc_PE::Hdl_at_impl( const Tok_at_impl & ) } void -Adoc_PE::Hdl_at_key( const Tok_at_key & ) +Adoc_PE::Hdl_at_key( const Tok_at_key & ) { InstallAtTag( CurDocu().Create_KeywordTag() ); @@ -112,7 +112,7 @@ Adoc_PE::Hdl_at_param( const Tok_at_param & ) } void -Adoc_PE::Hdl_at_see( const Tok_at_see & ) +Adoc_PE::Hdl_at_see( const Tok_at_see & ) { InstallAtTag( CurDocu().CheckIn_SeeTag() ); @@ -148,8 +148,8 @@ Adoc_PE::Hdl_at_module( const Tok_at_module & ) { // KORR_FUTURE -// pCurAtTag = CurDocu().Assign2_ModuleTag(); -// nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens(); +// pCurAtTag = CurDocu().Assign2_ModuleTag(); +// nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens(); } void @@ -157,8 +157,8 @@ Adoc_PE::Hdl_at_file( const Tok_at_file & ) { // KORR_FUTURE -// pCurAtTag = CurDocu().Assign2_FileTag(); -// nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens(); +// pCurAtTag = CurDocu().Assign2_FileTag(); +// nCurSpecialMeaningTokens = pCurAtTag->NrOfSpecialMeaningTokens(); } void @@ -166,14 +166,14 @@ Adoc_PE::Hdl_at_gloss( const Tok_at_gloss & ) { // KORR_FUTURE -// Create_GlossaryEntry(); +// Create_GlossaryEntry(); } void Adoc_PE::Hdl_at_global( const Tok_at_global & ) { // KORR_FUTURE -// Create_GlobalTextComponent(); +// Create_GlobalTextComponent(); } void @@ -248,7 +248,7 @@ Adoc_PE::Hdl_DocWord( const Tok_DocWord & i_rTok ) } void -Adoc_PE::Hdl_Whitespace( const Tok_Whitespace & i_rTok ) +Adoc_PE::Hdl_Whitespace( const Tok_Whitespace & i_rTok ) { if ( eCurTagState == ts_std ) { @@ -318,7 +318,7 @@ Adoc_PE::Hdl_Eol( const Tok_Eol & ) } void -Adoc_PE::Hdl_EoDocu( const Tok_EoDocu & ) +Adoc_PE::Hdl_EoDocu( const Tok_EoDocu & ) { bIsComplete = true; } diff --git a/autodoc/source/parser/adoc/prs_adoc.cxx b/autodoc/source/parser/adoc/prs_adoc.cxx index f2e48f7ee75d..5767b4224940 100644 --- a/autodoc/source/parser/adoc/prs_adoc.cxx +++ b/autodoc/source/parser/adoc/prs_adoc.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 diff --git a/autodoc/source/parser/adoc/tk_attag.cxx b/autodoc/source/parser/adoc/tk_attag.cxx index 6c9b500d4740..2d7a9b5f8b5b 100644 --- a/autodoc/source/parser/adoc/tk_attag.cxx +++ b/autodoc/source/parser/adoc/tk_attag.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 @@ -38,7 +38,7 @@ namespace adoc { void -Tok_at_std::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_at_std::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Hdl_at_std(*this); } @@ -49,17 +49,17 @@ Tok_at_std::Text() const // KORR_FUTURE return "A Tag"; -// return eId.Text(); +// return eId.Text(); } #define DEFINE_TOKEN_CLASS(name, text) \ void \ Tok_##name::Trigger( TokenInterpreter & io_rInterpreter ) const \ -{ io_rInterpreter.Hdl_##name(*this); } \ +{ io_rInterpreter.Hdl_##name(*this); } \ const char * \ Tok_##name::Text() const \ -{ return text; } +{ return text; } DEFINE_TOKEN_CLASS(at_base, "Base Classes") DEFINE_TOKEN_CLASS(at_exception, "Exceptions") diff --git a/autodoc/source/parser/adoc/tk_docw.cxx b/autodoc/source/parser/adoc/tk_docw.cxx index f7c3adb55761..7141d3202bec 100644 --- a/autodoc/source/parser/adoc/tk_docw.cxx +++ b/autodoc/source/parser/adoc/tk_docw.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 @@ -82,7 +82,7 @@ Tok_Whitespace::Text() const void -Tok_LineStart::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_LineStart::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Hdl_LineStart(*this); } diff --git a/autodoc/source/parser/cpp/all_toks.cxx b/autodoc/source/parser/cpp/all_toks.cxx index 3ea666ee94a9..8934e2e8b9ca 100644 --- a/autodoc/source/parser/cpp/all_toks.cxx +++ b/autodoc/source/parser/cpp/all_toks.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 diff --git a/autodoc/source/parser/cpp/all_toks.hxx b/autodoc/source/parser/cpp/all_toks.hxx index 4aeae6e1ce0e..e2b7a7f4d9e4 100644 --- a/autodoc/source/parser/cpp/all_toks.hxx +++ b/autodoc/source/parser/cpp/all_toks.hxx @@ -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 @@ -41,14 +41,14 @@ class Tok_Identifier : public cpp::Token { public: Tok_Identifier( - const char * i_sText ) : sText(i_sText) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; - virtual INT16 TypeId() const; + const char * i_sText ) : sText(i_sText) {} + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; + virtual INT16 TypeId() const; virtual const char * Text() const; private: - String sText; + String sText; }; const INT16 Tid_Identifier = 1; @@ -63,14 +63,14 @@ class Tok_Operator : public cpp::Token { public: Tok_Operator( - const char * i_sText ) : sText(i_sText) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; - virtual INT16 TypeId() const; + const char * i_sText ) : sText(i_sText) {} + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; + virtual INT16 TypeId() const; virtual const char * Text() const; private: - String sText; + String sText; }; const INT16 Tid_Operator = 2; @@ -79,9 +79,9 @@ const INT16 Tid_Operator = 2; #define DECL_TOKEN_CLASS(name,tid) \ class Tok_##name : public cpp::Token \ { public: \ - virtual void Trigger( \ - TokenInterpreter & io_rInterpreter ) const; \ - virtual INT16 TypeId() const; \ + virtual void Trigger( \ + TokenInterpreter & io_rInterpreter ) const; \ + virtual INT16 TypeId() const; \ virtual const char * \ Text() const; \ }; \ @@ -135,14 +135,14 @@ DECL_TOKEN_CLASS(typename,43); class Tok_##name : public cpp::Token \ { public: \ Tok_##name( \ - const char * i_sText ) : sText(i_sText) {} \ - virtual void Trigger( \ - TokenInterpreter & io_rInterpreter ) const; \ - virtual INT16 TypeId() const; \ + const char * i_sText ) : sText(i_sText) {} \ + virtual void Trigger( \ + TokenInterpreter & io_rInterpreter ) const; \ + virtual INT16 TypeId() const; \ virtual const char * \ Text() const; \ private: \ - String sText; \ + String sText; \ }; \ const INT16 Tid_##name = tid @@ -174,11 +174,11 @@ class Tok_UnblockMacro : public ::TextToken { public: Tok_UnblockMacro( - const char * i_sMacroName ) : sMacroName(i_sMacroName) {} - virtual const char* Text() const; + const char * i_sMacroName ) : sMacroName(i_sMacroName) {} + virtual const char* Text() const; - virtual void DealOut( - ::TokenDealer & o_rDealer ); + virtual void DealOut( + ::TokenDealer & o_rDealer ); private: String sMacroName; }; @@ -192,9 +192,9 @@ class Tok_Namespace : public cpp::Token // file class Tok_Bracket : public cpp::Token // ueberall class Tok_Separator : public cpp::Token // ueberall -class Tok_Identifier : public cpp::Token // ueberall +class Tok_Identifier : public cpp::Token // ueberall class Tok_NameSeparator : public cpp::Token // Type, Name -class Tok_BuiltInType : public cpp::Token // ueberall +class Tok_BuiltInType : public cpp::Token // ueberall class Tok_ConVol : public cpp::Token // class-><FuVa> class Tok_StorageClass : public cpp::Token // file-><type>,<FuVa> class Tok_OperatorFunctionName : public cpp::Token // class diff --git a/autodoc/source/parser/cpp/c_dealer.cxx b/autodoc/source/parser/cpp/c_dealer.cxx index a41d9daeb1d1..75485c886a6e 100644 --- a/autodoc/source/parser/cpp/c_dealer.cxx +++ b/autodoc/source/parser/cpp/c_dealer.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 diff --git a/autodoc/source/parser/cpp/c_dealer.hxx b/autodoc/source/parser/cpp/c_dealer.hxx index 64e833de622f..040bcdabeb66 100644 --- a/autodoc/source/parser/cpp/c_dealer.hxx +++ b/autodoc/source/parser/cpp/c_dealer.hxx @@ -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 @@ -70,32 +70,32 @@ class Distributor : public cpp::TokenDealer, /// Handle C++ code tokens. // LIFECYCLE Distributor( - ary::cpp::Gate & io_rGate ); + ary::cpp::Gate & io_rGate ); ~Distributor(); // OPERATIONS - void AssignPartners( + void AssignPartners( CharacterSource & io_rSourceText, const MacroMap & i_rValidMacros ); void StartNewFile( const csv::ploc::Path & i_file ); - virtual void Deal_Eol(); - virtual void Deal_Eof(); + virtual void Deal_Eol(); + virtual void Deal_Eof(); - virtual void Deal_CppCode( - cpp::Token & let_drToken ); + virtual void Deal_CppCode( + cpp::Token & let_drToken ); virtual void Deal_Cpp_UnblockMacro( - Tok_UnblockMacro & let_drToken ); + Tok_UnblockMacro & let_drToken ); - virtual void Deal_AdcDocu( - adoc::Token & let_drToken ); + virtual void Deal_AdcDocu( + adoc::Token & let_drToken ); virtual Distributor * AsDistributor(); private: // DATA PreProcessor aCppPreProcessor; - CodeExplorer aCodeExplorer; - adoc::DocuExplorer aDocuExplorer; + CodeExplorer aCodeExplorer; + adoc::DocuExplorer aDocuExplorer; ary::cpp::Gate * pGate; FileScope_EventHandler * pFileEventHandler; diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx index 1478496c057e..72c5612984bd 100644 --- a/autodoc/source/parser/cpp/c_rcode.cxx +++ b/autodoc/source/parser/cpp/c_rcode.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 @@ -40,7 +40,7 @@ #include <x_parse.hxx> #include "pe_file.hxx" -const uintt C_nNO_TRY = uintt(-1); +const uintt C_nNO_TRY = uintt(-1); namespace cpp { @@ -124,10 +124,10 @@ CodeExplorer::AcknowledgeResult() { throw X_Parser( X_Parser::x_UnexpectedToken, CurToken().Text(), aGlobalParseContext.CurFileName(), aGlobalParseContext.LineCount() ); } - } break; + } break; default: csv_assert(false); - } // end switch(CurResult().eStackAction) + } // end switch(CurResult().eStackAction) } const Token & diff --git a/autodoc/source/parser/cpp/c_rcode.hxx b/autodoc/source/parser/cpp/c_rcode.hxx index 740faaa9b9a9..ddc60b2de92d 100644 --- a/autodoc/source/parser/cpp/c_rcode.hxx +++ b/autodoc/source/parser/cpp/c_rcode.hxx @@ -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 @@ -69,8 +69,8 @@ class CodeExplorer : private TokenProcessing_Types ~CodeExplorer(); void StartNewFile(); - void Process_Token( - DYN cpp::Token & let_drToken ); + void Process_Token( + DYN cpp::Token & let_drToken ); // ACCESS FileScope_EventHandler & FileEventHandler() { return aGlobalParseContext; } @@ -79,21 +79,21 @@ class CodeExplorer : private TokenProcessing_Types private: typedef std::vector< cpp::Cpp_PE* > EnvironmentStack; - void AcknowledgeResult(); - const Token & CurToken() const; - Cpp_PE & CurEnv() const; - Cpp_PE & PushEnv() const; + void AcknowledgeResult(); + const Token & CurToken() const; + Cpp_PE & CurEnv() const; + Cpp_PE & PushEnv() const; TokenProcessing_Result & CurResult() { return aGlobalParseContext.CurResult(); } // DATA ContextForAry aGlobalParseContext; - EnvironmentStack aEnvironments; + EnvironmentStack aEnvironments; Dyn<PE_File> pPE_File; - ary::cpp::Gate * pGate; - cpp::Token * dpCurToken; + ary::cpp::Gate * pGate; + cpp::Token * dpCurToken; }; diff --git a/autodoc/source/parser/cpp/cpp_pe.cxx b/autodoc/source/parser/cpp/cpp_pe.cxx index 1e224897186d..45c4e84a13ce 100644 --- a/autodoc/source/parser/cpp/cpp_pe.cxx +++ b/autodoc/source/parser/cpp/cpp_pe.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 @@ -40,24 +40,24 @@ namespace cpp { void -Cpp_PE::SetTokenResult( E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ) +Cpp_PE::SetTokenResult( E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ) { - rMyEnv.SetTokenResult( i_eDone, + rMyEnv.SetTokenResult( i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push ); } Cpp_PE::Cpp_PE( Cpp_PE * io_pParent ) - : ParseEnvironment( io_pParent ), + : ParseEnvironment( io_pParent ), rMyEnv( io_pParent->Env() ) { csv_assert(io_pParent != 0); } Cpp_PE::Cpp_PE( EnvData & i_rEnv ) - : ParseEnvironment(0), + : ParseEnvironment(0), rMyEnv(i_rEnv) { } diff --git a/autodoc/source/parser/cpp/cpp_pe.hxx b/autodoc/source/parser/cpp/cpp_pe.hxx index cd3ba0af46f2..c1b0b5589857 100644 --- a/autodoc/source/parser/cpp/cpp_pe.hxx +++ b/autodoc/source/parser/cpp/cpp_pe.hxx @@ -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 @@ -47,32 +47,32 @@ class Cpp_PE : public ::ParseEnvironment, public TokenInterpreter { public: - typedef cpp::PeEnvironment EnvData; + typedef cpp::PeEnvironment EnvData; - void SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push = 0 ); + void SetTokenResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push = 0 ); virtual Cpp_PE * Handle_ChildFailure(); // Defaulted to 0. protected: Cpp_PE( - Cpp_PE * io_pParent ); + Cpp_PE * io_pParent ); Cpp_PE( - EnvData & i_rEnv ); + EnvData & i_rEnv ); - EnvData & Env() const; + EnvData & Env() const; void StdHandlingOfSyntaxError( const char * i_sText ); private: // DATA - EnvData & rMyEnv; + EnvData & rMyEnv; }; -inline Cpp_PE::EnvData & +inline Cpp_PE::EnvData & Cpp_PE::Env() const { return rMyEnv; } diff --git a/autodoc/source/parser/cpp/cpp_tok.hxx b/autodoc/source/parser/cpp/cpp_tok.hxx index 7f4200a86dda..960ad0dc7f79 100644 --- a/autodoc/source/parser/cpp/cpp_tok.hxx +++ b/autodoc/source/parser/cpp/cpp_tok.hxx @@ -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 @@ -46,14 +46,14 @@ class Token : public TextToken { public: // LIFECYCLE - virtual ~Token() {} + virtual ~Token() {} // OPERATIONS - virtual INT16 TypeId() const = 0; - virtual void DealOut( - ::TokenDealer & o_rDealer ); - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const = 0; + virtual INT16 TypeId() const = 0; + virtual void DealOut( + ::TokenDealer & o_rDealer ); + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const = 0; }; diff --git a/autodoc/source/parser/cpp/cx_base.cxx b/autodoc/source/parser/cpp/cx_base.cxx index dad8a50b10e0..2493a700a766 100644 --- a/autodoc/source/parser/cpp/cx_base.cxx +++ b/autodoc/source/parser/cpp/cx_base.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 @@ -40,7 +40,7 @@ namespace cpp { Cx_Base::Cx_Base( TkpContext * io_pFollowUpContext ) - : pDealer(0), + : pDealer(0), pFollowUpContext(io_pFollowUpContext) // pNewToken { @@ -57,7 +57,7 @@ Cx_Base::PassNewToken() return false; } -TkpContext & +TkpContext & Cx_Base::FollowUpContext() { csv_assert(pFollowUpContext != 0); diff --git a/autodoc/source/parser/cpp/cx_base.hxx b/autodoc/source/parser/cpp/cx_base.hxx index 4e7ff2e3b34b..0bdbb6e5cb8f 100644 --- a/autodoc/source/parser/cpp/cx_base.hxx +++ b/autodoc/source/parser/cpp/cx_base.hxx @@ -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 @@ -48,7 +48,7 @@ class Distributor; class Cx_Base : public ::TkpContext { public: - virtual bool PassNewToken(); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); @@ -57,27 +57,27 @@ class Cx_Base : public ::TkpContext protected: // LIFECYCLE Cx_Base( - TkpContext * io_pFollowUpContext ); + TkpContext * io_pFollowUpContext ); - void SetNewToken( - DYN ::TextToken * let_dpToken ); - void SetFollowUpContext( - TkpContext * io_pContext ); + void SetNewToken( + DYN ::TextToken * let_dpToken ); + void SetFollowUpContext( + TkpContext * io_pContext ); Distributor & Dealer() const; private: // DATA - Distributor * pDealer; - TkpContext * pFollowUpContext; - Dyn< ::TextToken > pNewToken; + Distributor * pDealer; + TkpContext * pFollowUpContext; + Dyn< ::TextToken > pNewToken; }; inline void -Cx_Base::SetNewToken( DYN ::TextToken * let_dpToken ) +Cx_Base::SetNewToken( DYN ::TextToken * let_dpToken ) { pNewToken = let_dpToken; } inline void Cx_Base::SetFollowUpContext( TkpContext * io_pContext ) diff --git a/autodoc/source/parser/cpp/cx_c_pp.cxx b/autodoc/source/parser/cpp/cx_c_pp.cxx index 9c81fe71af36..6e494e9f799a 100644 --- a/autodoc/source/parser/cpp/cx_c_pp.cxx +++ b/autodoc/source/parser/cpp/cx_c_pp.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 @@ -42,7 +42,7 @@ namespace cpp { Context_Preprocessor::Context_Preprocessor( TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext), + : Cx_Base(&i_rFollowUpContext), pContext_Parent(&i_rFollowUpContext), pContext_PP_MacroParams( 0 ), pContext_PP_Definition( new Context_PP_Definition(i_rFollowUpContext) ) @@ -51,7 +51,7 @@ Context_Preprocessor::Context_Preprocessor( TkpContext & i_rFollowUpContext ) } void -Context_Preprocessor::ReadCharChain( CharacterSource & io_rText ) +Context_Preprocessor::ReadCharChain( CharacterSource & io_rText ) { jumpOverWhite( io_rText ); jumpToWhite( io_rText ); @@ -87,7 +87,7 @@ Context_Preprocessor::ReadDefault( CharacterSource & io_rText ) } void -Context_Preprocessor::ReadDefine( CharacterSource & io_rText ) +Context_Preprocessor::ReadDefine( CharacterSource & io_rText ) { jumpOverWhite( io_rText ); io_rText.CutToken(); @@ -116,7 +116,7 @@ Context_Preprocessor::ReadDefine( CharacterSource & io_rText ) Context_PP_MacroParams::Context_PP_MacroParams( Cx_Base & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext), + : Cx_Base(&i_rFollowUpContext), pContext_PP_Definition(&i_rFollowUpContext) { } @@ -150,7 +150,7 @@ Context_PP_MacroParams::ReadCharChain( CharacterSource & io_rText ) } Context_PP_Definition::Context_PP_Definition( TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext), + : Cx_Base(&i_rFollowUpContext), pContext_Parent(&i_rFollowUpContext) { } diff --git a/autodoc/source/parser/cpp/cx_c_pp.hxx b/autodoc/source/parser/cpp/cx_c_pp.hxx index 0b0e86d2e690..a2320fe67f62 100644 --- a/autodoc/source/parser/cpp/cx_c_pp.hxx +++ b/autodoc/source/parser/cpp/cx_c_pp.hxx @@ -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 @@ -44,22 +44,22 @@ class Context_Preprocessor : public Cx_Base { public: Context_Preprocessor( - TkpContext & i_rFollowUpContext ); - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ); + virtual void ReadCharChain( + CharacterSource & io_rText ); virtual void AssignDealer( Distributor & o_rDealer ); private: // Locals void ReadDefault( - CharacterSource & io_rText ); + CharacterSource & io_rText ); void ReadDefine( - CharacterSource & io_rText ); + CharacterSource & io_rText ); // DATA - TkpContext * pContext_Parent; - Dyn<Cx_Base> pContext_PP_MacroParams; - Dyn<Cx_Base> pContext_PP_Definition; + TkpContext * pContext_Parent; + Dyn<Cx_Base> pContext_PP_MacroParams; + Dyn<Cx_Base> pContext_PP_Definition; }; class Context_PP_MacroParams : public Cx_Base @@ -68,25 +68,25 @@ class Context_PP_MacroParams : public Cx_Base Context_PP_MacroParams( Cx_Base & i_rFollowUpContext ); - virtual void ReadCharChain( - CharacterSource & io_rText ); + virtual void ReadCharChain( + CharacterSource & io_rText ); private: // DATA - Cx_Base * pContext_PP_Definition; + Cx_Base * pContext_PP_Definition; }; class Context_PP_Definition : public Cx_Base { public: Context_PP_Definition( - TkpContext & i_rFollowUpContext ); + TkpContext & i_rFollowUpContext ); - virtual void ReadCharChain( - CharacterSource & io_rText ); + virtual void ReadCharChain( + CharacterSource & io_rText ); private: // DATA - TkpContext * pContext_Parent; + TkpContext * pContext_Parent; }; diff --git a/autodoc/source/parser/cpp/cx_c_std.cxx b/autodoc/source/parser/cpp/cx_c_std.cxx index 73eed711dad4..741336280166 100644 --- a/autodoc/source/parser/cpp/cx_c_std.cxx +++ b/autodoc/source/parser/cpp/cx_c_std.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 @@ -153,7 +153,7 @@ Context_CppStd::ReadCharChain( CharacterSource & io_rText ) StmBoundsStatus & rBound = aStateMachine.GetCharChain(fTokenCreateFunction, io_rText); // !!! - // The order of the next two lines is essential, because + // The order of the next two lines is essential, because // pFollowUpContext may be changed by PerformStatusFunction() also, // which then MUST override the previous assignment. SetFollowUpContext(rBound.FollowUpContext()); @@ -175,9 +175,9 @@ Context_CppStd::AssignDealer( Distributor & o_rDealer ) } void -Context_CppStd::PerformStatusFunction( uintt i_nStatusSignal, - F_CRTOK i_fTokenCreateFunction, - CharacterSource & io_rText ) +Context_CppStd::PerformStatusFunction( uintt i_nStatusSignal, + F_CRTOK i_fTokenCreateFunction, + CharacterSource & io_rText ) { switch (i_nStatusSignal) { @@ -233,19 +233,19 @@ Context_CppStd::PerformStatusFunction( uintt i_nStatusSignal, String sCurChar( &cCC, 1 ); throw X_Parser( X_Parser::x_InvalidChar, sCurChar, String::Null_(), 0 ); } - } // end switch (i_nStatusSignal) + } // end switch (i_nStatusSignal) } void Context_CppStd::SetupStateMachine() { // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel): -// const INT16 top = 0; // Top-Status - const INT16 wht = 1; // Whitespace-überlese-Status - const INT16 bez = 2; // Bezeichner-lese-Status +// const INT16 top = 0; // Top-Status + const INT16 wht = 1; // Whitespace-überlese-Status + const INT16 bez = 2; // Bezeichner-lese-Status // Tokenfinish-Stati: - const INT16 finError = 3; + const INT16 finError = 3; const INT16 finIgnore = 4; const INT16 finBezeichner = 5; const INT16 finKeyword = 6; @@ -256,12 +256,12 @@ Context_CppStd::SetupStateMachine() const INT16 finEOF = 11; // Kontextwechsel-Stati: - const INT16 gotoComment = 12; - const INT16 gotoDocu = 13; + const INT16 gotoComment = 12; + const INT16 gotoDocu = 13; const INT16 gotoPreprocessor = 14; - const INT16 gotoConstString = 15; - const INT16 gotoConstChar = 16; - const INT16 gotoConstNumeric = 17; + const INT16 gotoConstString = 15; + const INT16 gotoConstChar = 16; + const INT16 gotoConstNumeric = 17; const INT16 gotoUnblockMacro = 18; // Abbreviations to be used in status tables: @@ -277,7 +277,7 @@ Context_CppStd::SetupStateMachine() /// Zeros - '0' - will be replaced by AddToken(). const INT16 A_nTopStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fof,err,err,err,err,err,err,err,err,wht, 0,wht,wht, 0,err,err, err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ... wht, 0,cst, 0,err, 0, 0,cch, 0, 0, 0, 0, 0, 0, 0, 0, @@ -289,7 +289,7 @@ Context_CppStd::SetupStateMachine() }; const INT16 A_nWhitespaceStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fof,err,err,err,err,err,err,err,err,wht,fig,wht,wht,fig,err,err, err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ... wht,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, @@ -301,7 +301,7 @@ Context_CppStd::SetupStateMachine() }; const INT16 A_nBezeichnerStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err, err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ... fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz, @@ -314,7 +314,7 @@ Context_CppStd::SetupStateMachine() const INT16 A_nOperatorDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ... err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, @@ -326,7 +326,7 @@ Context_CppStd::SetupStateMachine() }; const INT16 A_nBezDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err, err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ... fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz, @@ -344,38 +344,38 @@ Context_CppStd::SetupStateMachine() DYN StmArrayStatus * dpStatusBez = new StmArrayStatus( C_nStatusSize, A_nBezeichnerStatus, TCF_Identifier, true); - DYN StmBoundsStatus * dpBst_finError + DYN StmBoundsStatus * dpBst_finError = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_Error, true ); - DYN StmBoundsStatus * dpBst_finIgnore + DYN StmBoundsStatus * dpBst_finIgnore = new StmBoundsStatus( *this, *this, nF_fin_Ignore, true ); - DYN StmBoundsStatus * dpBst_finBezeichner + DYN StmBoundsStatus * dpBst_finBezeichner = new StmBoundsStatus( *this, *this, nF_fin_Bezeichner, true ); - DYN StmBoundsStatus * dpBst_finKeyword + DYN StmBoundsStatus * dpBst_finKeyword = new StmBoundsStatus( *this, *this, nF_fin_CreateWithoutText, false ); - DYN StmBoundsStatus * dpBst_finPunctuation + DYN StmBoundsStatus * dpBst_finPunctuation = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false ); - DYN StmBoundsStatus * dpBst_finBiType + DYN StmBoundsStatus * dpBst_finBiType = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false ); - DYN StmBoundsStatus * dpBst_finTypeModifier + DYN StmBoundsStatus * dpBst_finTypeModifier = new StmBoundsStatus( *this, *this, nF_fin_CreateWithText, false ); - DYN StmBoundsStatus * dpBst_finEOL + DYN StmBoundsStatus * dpBst_finEOL = new StmBoundsStatus( *this, *this, nF_fin_EOL, false ); - DYN StmBoundsStatus * dpBst_finEOF + DYN StmBoundsStatus * dpBst_finEOF = new StmBoundsStatus( *this, TkpContext::Null_(), nF_fin_EOF, false ); - DYN StmBoundsStatus * dpBst_gotoComment + DYN StmBoundsStatus * dpBst_gotoComment = new StmBoundsStatus( *this, *pContext_Comment, nF_goto_Comment, false ); - DYN StmBoundsStatus * dpBst_gotoDocu + DYN StmBoundsStatus * dpBst_gotoDocu = new StmBoundsStatus( *this, *pDocuContext, nF_goto_Docu, false ); - DYN StmBoundsStatus * dpBst_gotoPreprocessor + DYN StmBoundsStatus * dpBst_gotoPreprocessor = new StmBoundsStatus( *this, *pContext_Preprocessor, nF_goto_Preprocessor, false ); - DYN StmBoundsStatus * dpBst_gotoConstString + DYN StmBoundsStatus * dpBst_gotoConstString = new StmBoundsStatus( *this, *pContext_ConstString, nF_goto_Const, false ); - DYN StmBoundsStatus * dpBst_gotoConstChar + DYN StmBoundsStatus * dpBst_gotoConstChar = new StmBoundsStatus( *this, *pContext_ConstChar, nF_goto_Const, false ); - DYN StmBoundsStatus * dpBst_gotoConstNumeric + DYN StmBoundsStatus * dpBst_gotoConstNumeric = new StmBoundsStatus( *this, *pContext_ConstNumeric, nF_goto_Const, false ); - DYN StmBoundsStatus * dpBst_gotoUnblockMacro + DYN StmBoundsStatus * dpBst_gotoUnblockMacro = new StmBoundsStatus( *this, *pContext_UnblockMacro, nF_goto_UnblockMacro, false ); // dpMain aufbauen: @@ -482,47 +482,47 @@ Context_CppStd::SetupStateMachine() aStateMachine.AddToken(">>=",TCF_Operator,A_nOperatorDefStatus,finPunctuation); // Builtin types - aStateMachine.AddToken("char", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("short", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("int", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("long", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("float", TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("double",TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("wchar_t",TCF_BuiltInType, A_nBezDefStatus, finBiType); - aStateMachine.AddToken("size_t",TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("char", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("short", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("int", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("long", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("float", TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("double",TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("wchar_t",TCF_BuiltInType, A_nBezDefStatus, finBiType); + aStateMachine.AddToken("size_t",TCF_BuiltInType, A_nBezDefStatus, finBiType); // Type modifiers - aStateMachine.AddToken("signed", TCF_TypeModifier, A_nBezDefStatus, finTypeModifier); - aStateMachine.AddToken("unsigned", TCF_TypeModifier, A_nBezDefStatus, finTypeModifier); + aStateMachine.AddToken("signed", TCF_TypeModifier, A_nBezDefStatus, finTypeModifier); + aStateMachine.AddToken("unsigned", TCF_TypeModifier, A_nBezDefStatus, finTypeModifier); // To ignore - aStateMachine.AddToken("auto", 0, A_nBezDefStatus, finIgnore); - aStateMachine.AddToken("_cdecl", 0, A_nBezDefStatus, finIgnore); - aStateMachine.AddToken("__cdecl", 0, A_nBezDefStatus, finIgnore); - aStateMachine.AddToken("__stdcall", 0, A_nBezDefStatus, finIgnore); - aStateMachine.AddToken("__fastcall",0, A_nBezDefStatus, finIgnore); - aStateMachine.AddToken("/**/", 0, A_nOperatorDefStatus,finIgnore); + aStateMachine.AddToken("auto", 0, A_nBezDefStatus, finIgnore); + aStateMachine.AddToken("_cdecl", 0, A_nBezDefStatus, finIgnore); + aStateMachine.AddToken("__cdecl", 0, A_nBezDefStatus, finIgnore); + aStateMachine.AddToken("__stdcall", 0, A_nBezDefStatus, finIgnore); + aStateMachine.AddToken("__fastcall",0, A_nBezDefStatus, finIgnore); + aStateMachine.AddToken("/**/", 0, A_nOperatorDefStatus,finIgnore); // Context changers - aStateMachine.AddToken("#", 0, A_nOperatorDefStatus, gotoPreprocessor); - aStateMachine.AddToken("#undef",0, A_nOperatorDefStatus, gotoPreprocessor); + aStateMachine.AddToken("#", 0, A_nOperatorDefStatus, gotoPreprocessor); + aStateMachine.AddToken("#undef",0, A_nOperatorDefStatus, gotoPreprocessor); aStateMachine.AddToken("#unblock-", - 0, A_nOperatorDefStatus, gotoUnblockMacro); - aStateMachine.AddToken("/*", 0, A_nOperatorDefStatus, gotoComment); - aStateMachine.AddToken("//", 0, A_nOperatorDefStatus, gotoComment); - aStateMachine.AddToken("/**", 0, A_nOperatorDefStatus, gotoDocu); - aStateMachine.AddToken("///", 0, A_nOperatorDefStatus, gotoDocu); + 0, A_nOperatorDefStatus, gotoUnblockMacro); + aStateMachine.AddToken("/*", 0, A_nOperatorDefStatus, gotoComment); + aStateMachine.AddToken("//", 0, A_nOperatorDefStatus, gotoComment); + aStateMachine.AddToken("/**", 0, A_nOperatorDefStatus, gotoDocu); + aStateMachine.AddToken("///", 0, A_nOperatorDefStatus, gotoDocu); // Line ends - // regular - aStateMachine.AddToken("\r\n", 0, A_nOperatorDefStatus, finEOL); - aStateMachine.AddToken("\n", 0, A_nOperatorDefStatus, finEOL); - aStateMachine.AddToken("\r", 0, A_nOperatorDefStatus, finEOL); - // To ignore in some cases(may be only at preprocessor?), but - // linecount has to be incremented. - aStateMachine.AddToken("\\\r\n",0, A_nOperatorDefStatus, finEOL); - aStateMachine.AddToken("\\\n", 0, A_nOperatorDefStatus, finEOL); - aStateMachine.AddToken("\\\r", 0, A_nOperatorDefStatus, finEOL); + // regular + aStateMachine.AddToken("\r\n", 0, A_nOperatorDefStatus, finEOL); + aStateMachine.AddToken("\n", 0, A_nOperatorDefStatus, finEOL); + aStateMachine.AddToken("\r", 0, A_nOperatorDefStatus, finEOL); + // To ignore in some cases(may be only at preprocessor?), but + // linecount has to be incremented. + aStateMachine.AddToken("\\\r\n",0, A_nOperatorDefStatus, finEOL); + aStateMachine.AddToken("\\\n", 0, A_nOperatorDefStatus, finEOL); + aStateMachine.AddToken("\\\r", 0, A_nOperatorDefStatus, finEOL); }; diff --git a/autodoc/source/parser/cpp/cx_c_std.hxx b/autodoc/source/parser/cpp/cx_c_std.hxx index fac94a548877..fadbde3caf78 100644 --- a/autodoc/source/parser/cpp/cx_c_std.hxx +++ b/autodoc/source/parser/cpp/cx_c_std.hxx @@ -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 @@ -49,27 +49,27 @@ class Context_CppStd : public Cx_Base, private StateMachineContext { public: - // LIFECYCLE + // LIFECYCLE Context_CppStd( DYN autodoc::TkpDocuContext & - let_drContext_Docu ); + let_drContext_Docu ); ~Context_CppStd(); - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); virtual void AssignDealer( Distributor & o_rDealer ); private: - // SERVICE FUNCTIONS - void PerformStatusFunction( - uintt i_nStatusSignal, + // SERVICE FUNCTIONS + void PerformStatusFunction( + uintt i_nStatusSignal, StmArrayStatus::F_CRTOK i_fTokenCreateFunction, - CharacterSource & io_rText ); - void SetupStateMachine(); + CharacterSource & io_rText ); + void SetupStateMachine(); - // DATA - StateMachine aStateMachine; + // DATA + StateMachine aStateMachine; // Contexts Dyn<autodoc::TkpDocuContext> @@ -77,7 +77,7 @@ class Context_CppStd : public Cx_Base, Dyn<Context_Comment> pContext_Comment; - Dyn<Cx_Base> pContext_Preprocessor; + Dyn<Cx_Base> pContext_Preprocessor; Dyn<Cx_Base> pContext_ConstString; Dyn<Cx_Base> pContext_ConstChar; Dyn<Cx_Base> pContext_ConstNumeric; diff --git a/autodoc/source/parser/cpp/cx_c_sub.cxx b/autodoc/source/parser/cpp/cx_c_sub.cxx index 76e5779312b4..9031342efc99 100644 --- a/autodoc/source/parser/cpp/cx_c_sub.cxx +++ b/autodoc/source/parser/cpp/cx_c_sub.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 @@ -44,10 +44,10 @@ namespace cpp { void -Context_Comment::ReadCharChain( CharacterSource & io_rText ) +Context_Comment::ReadCharChain( CharacterSource & io_rText ) { // KORR_FUTURE - // Counting of lines must be implemented. + // Counting of lines must be implemented. if (bCurrentModeIsMultiline) { char cNext = NULCH; @@ -88,14 +88,14 @@ Context_Comment::ReadCharChain( CharacterSource & io_rText ) void -Context_ConstString::ReadCharChain( CharacterSource & io_rText ) +Context_ConstString::ReadCharChain( CharacterSource & io_rText ) { char cNext = io_rText.MoveOn(); while (cNext != '"') - { // Get one complete string constant: "...." + { // Get one complete string constant: "...." while (cNext != '"' AND cNext != '\\') - { // Get string till next '\\' + { // Get string till next '\\' cNext = io_rText.MoveOn(); } if (cNext == '\\') @@ -109,14 +109,14 @@ Context_ConstString::ReadCharChain( CharacterSource & io_rText ) } void -Context_ConstChar::ReadCharChain( CharacterSource & io_rText ) +Context_ConstChar::ReadCharChain( CharacterSource & io_rText ) { char cNext = io_rText.MoveOn(); while (cNext != '\'') - { // Get one complete char constant: "...." + { // Get one complete char constant: "...." while (cNext != '\'' AND cNext != '\\') - { // Get string till next '\\' + { // Get string till next '\\' cNext = io_rText.MoveOn(); } if (cNext == '\\') @@ -143,7 +143,7 @@ Context_ConstNumeric::ReadCharChain(CharacterSource & io_rText) cNext = io_rText.MoveOn(); if (cNext == '+' OR cNext == '-') cNext = io_rText.MoveOn(); - } // endif + } // endif } while (isalnum(cNext) OR cNext == '.'); // Reicht aus, wenn Zahlen korrekt geschrieben sind SetNewToken(new Tok_Constant(io_rText.CutToken())); } diff --git a/autodoc/source/parser/cpp/cx_c_sub.hxx b/autodoc/source/parser/cpp/cx_c_sub.hxx index 6e2d3d8807ed..8f7c12f67d0b 100644 --- a/autodoc/source/parser/cpp/cx_c_sub.hxx +++ b/autodoc/source/parser/cpp/cx_c_sub.hxx @@ -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 @@ -44,55 +44,55 @@ class Context_Comment : public Cx_Base { public: Context_Comment( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetMode_IsMultiLine( - bool i_bTrue ) + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetMode_IsMultiLine( + bool i_bTrue ) { bCurrentModeIsMultiline = i_bTrue; } private: - bool bCurrentModeIsMultiline; + bool bCurrentModeIsMultiline; }; class Context_ConstString : public Cx_Base { public: Context_ConstString( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_ConstChar : public Cx_Base { public: Context_ConstChar( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_ConstNumeric : public Cx_Base { public: Context_ConstNumeric( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_UnblockMacro : public Cx_Base { public: Context_UnblockMacro( - TkpContext & i_rFollowUpContext ) - : Cx_Base(&i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + TkpContext & i_rFollowUpContext ) + : Cx_Base(&i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; diff --git a/autodoc/source/parser/cpp/cxt2ary.cxx b/autodoc/source/parser/cpp/cxt2ary.cxx index eda70ca1045e..8a1deaef854f 100644 --- a/autodoc/source/parser/cpp/cxt2ary.cxx +++ b/autodoc/source/parser/cpp/cxt2ary.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 @@ -117,9 +117,9 @@ ContextForAry::inq_CurProtection() const } void -ContextForAry::do_SetTokenResult( E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ) +ContextForAry::do_SetTokenResult( E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ) { aTokenResult.eDone = i_eDone; aTokenResult.eStackAction = i_eWhat2DoWithEnvStack; @@ -148,7 +148,7 @@ ContextForAry::do_OpenClass( ary::cpp::Class & io_rOpenedClass ) } void -ContextForAry::do_OpenEnum( ary::cpp::Enum & io_rOpenedEnum ) +ContextForAry::do_OpenEnum( ary::cpp::Enum & io_rOpenedEnum ) { pOwnerStack->OpenEnum(io_rOpenedEnum); pDocuDistributor->SetCurrentlyStoredRe(io_rOpenedEnum); diff --git a/autodoc/source/parser/cpp/cxt2ary.hxx b/autodoc/source/parser/cpp/cxt2ary.hxx index 9006aefa645e..1e3b142856e0 100644 --- a/autodoc/source/parser/cpp/cxt2ary.hxx +++ b/autodoc/source/parser/cpp/cxt2ary.hxx @@ -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 @@ -76,7 +76,7 @@ class ContextForAry : public ary::cpp::InputContext, // LIFECYCLE ContextForAry( ary::cpp::Gate & io_rAryGate ); - virtual ~ContextForAry(); + virtual ~ContextForAry(); // OPERATIONS void ResetResult() { aTokenResult.Reset(); } @@ -105,18 +105,18 @@ class ContextForAry : public ary::cpp::InputContext, // Interface PeEnvironment virtual void do_SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ); + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ); virtual void do_OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace ); virtual void do_OpenExternC( - bool i_bOnlyForOneDeclaration ); + bool i_bOnlyForOneDeclaration ); virtual void do_OpenClass( - ary::cpp::Class & io_rOpenedClass ); + ary::cpp::Class & io_rOpenedClass ); virtual void do_OpenEnum( - ary::cpp::Enum & io_rOpenedEnum ); + ary::cpp::Enum & io_rOpenedEnum ); virtual void do_CloseBlock(); virtual void do_CloseClass(); virtual void do_CloseEnum(); @@ -160,7 +160,7 @@ class ContextForAry : public ary::cpp::InputContext, inq_AryGate() const; virtual const ary::cpp::InputContext & inq_Context() const; - virtual String inq_CurFileName() const; + virtual String inq_CurFileName() const; virtual uintt inq_LineCount() const; virtual bool inq_IsWaitingFor_Recovery() const; virtual bool inq_IsExternC() const; diff --git a/autodoc/source/parser/cpp/defdescr.cxx b/autodoc/source/parser/cpp/defdescr.cxx index c233a5d93be4..e4751427f4be 100644 --- a/autodoc/source/parser/cpp/defdescr.cxx +++ b/autodoc/source/parser/cpp/defdescr.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 diff --git a/autodoc/source/parser/cpp/defdescr.hxx b/autodoc/source/parser/cpp/defdescr.hxx index 3980ea7c77fa..feb78a7cf338 100644 --- a/autodoc/source/parser/cpp/defdescr.hxx +++ b/autodoc/source/parser/cpp/defdescr.hxx @@ -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 diff --git a/autodoc/source/parser/cpp/fevnthdl.hxx b/autodoc/source/parser/cpp/fevnthdl.hxx index 0198f404f588..1068448e04a7 100644 --- a/autodoc/source/parser/cpp/fevnthdl.hxx +++ b/autodoc/source/parser/cpp/fevnthdl.hxx @@ -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 @@ -52,7 +52,7 @@ namespace cpp { -/** This is an interface, which accepts the file scope events that may +/** This is an interface, which accepts the file scope events that may be important for parsing. It is implementation-dependant, where to put or what to do with them. */ @@ -64,7 +64,7 @@ class FileScope_EventHandler // OPERATIONS void SetCurFile( - ary::loc::File & io_rCurFile ); + ary::loc::File & io_rCurFile ); void Event_IncrLineCount(); void Event_SwBracketOpen(); void Event_SwBracketClose(); @@ -72,7 +72,7 @@ class FileScope_EventHandler private: virtual void do_SetCurFile( - ary::loc::File & io_rCurFile ) = 0; + ary::loc::File & io_rCurFile ) = 0; virtual void do_Event_IncrLineCount() = 0; virtual void do_Event_SwBracketOpen() = 0; virtual void do_Event_SwBracketClose() = 0; diff --git a/autodoc/source/parser/cpp/icprivow.cxx b/autodoc/source/parser/cpp/icprivow.cxx index 8202e12862e7..526236f563ab 100644 --- a/autodoc/source/parser/cpp/icprivow.cxx +++ b/autodoc/source/parser/cpp/icprivow.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 diff --git a/autodoc/source/parser/cpp/icprivow.hxx b/autodoc/source/parser/cpp/icprivow.hxx index 5321df48e34a..bf688a7cc924 100644 --- a/autodoc/source/parser/cpp/icprivow.hxx +++ b/autodoc/source/parser/cpp/icprivow.hxx @@ -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 diff --git a/autodoc/source/parser/cpp/pe_base.cxx b/autodoc/source/parser/cpp/pe_base.cxx index 0a4c823a47a4..a4ff9857e079 100644 --- a/autodoc/source/parser/cpp/pe_base.cxx +++ b/autodoc/source/parser/cpp/pe_base.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 @@ -56,8 +56,8 @@ PE_Base::PE_Base( Cpp_PE * i_pParent ) Setup_StatusFunctions(); aBaseIds.reserve(4); - pSpType = new SP_Type(*this); - pSpuBaseName = new SPU_BaseName(*pSpType, 0, &PE_Base::SpReturn_BaseName); + pSpType = new SP_Type(*this); + pSpuBaseName = new SPU_BaseName(*pSpType, 0, &PE_Base::SpReturn_BaseName); } @@ -74,25 +74,25 @@ PE_Base::Call_Handler( const cpp::Token & i_rTok ) void PE_Base::Setup_StatusFunctions() { - typedef CallFunction<PE_Base>::F_Tok F_Tok; - static F_Tok stateF_startOfNext[] = { &PE_Base::On_startOfNext_Identifier, + typedef CallFunction<PE_Base>::F_Tok F_Tok; + static F_Tok stateF_startOfNext[] = { &PE_Base::On_startOfNext_Identifier, &PE_Base::On_startOfNext_public, &PE_Base::On_startOfNext_protected, &PE_Base::On_startOfNext_private, &PE_Base::On_startOfNext_virtual, &PE_Base::On_startOfNext_DoubleColon }; - static INT16 stateT_startOfNext[] = { Tid_Identifier, + static INT16 stateT_startOfNext[] = { Tid_Identifier, Tid_public, Tid_protected, Tid_private, Tid_virtual, Tid_DoubleColon }; - static F_Tok stateF_inName[] = { &PE_Base::On_inName_Identifier, + static F_Tok stateF_inName[] = { &PE_Base::On_inName_Identifier, &PE_Base::On_inName_virtual, &PE_Base::On_inName_SwBracket_Left, &PE_Base::On_inName_DoubleColon, &PE_Base::On_inName_Comma }; - static INT16 stateT_inName[] = { Tid_Identifier, + static INT16 stateT_inName[] = { Tid_Identifier, Tid_virtual, Tid_SwBracket_Left, Tid_DoubleColon, diff --git a/autodoc/source/parser/cpp/pe_base.hxx b/autodoc/source/parser/cpp/pe_base.hxx index 0a39160b6a19..933d596b7f35 100644 --- a/autodoc/source/parser/cpp/pe_base.hxx +++ b/autodoc/source/parser/cpp/pe_base.hxx @@ -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 @@ -62,45 +62,45 @@ class PE_Base : public Cpp_PE Cpp_PE * i_pParent ); ~PE_Base(); - const BaseList & Result_BaseIds() const; + const BaseList & Result_BaseIds() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_Base, PE_Type > SP_Type; - typedef SubPeUse< PE_Base, PE_Type> SPU_BaseName; + typedef SubPe< PE_Base, PE_Type > SP_Type; + typedef SubPeUse< PE_Base, PE_Type> SPU_BaseName; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void SpReturn_BaseName(); + void SpReturn_BaseName(); - void On_startOfNext_Identifier(const char *); - void On_startOfNext_public(const char *); - void On_startOfNext_protected(const char *); - void On_startOfNext_private(const char *); - void On_startOfNext_virtual(const char *); - void On_startOfNext_DoubleColon(const char *); + void On_startOfNext_Identifier(const char *); + void On_startOfNext_public(const char *); + void On_startOfNext_protected(const char *); + void On_startOfNext_private(const char *); + void On_startOfNext_virtual(const char *); + void On_startOfNext_DoubleColon(const char *); - void On_inName_Identifier(const char *); - void On_inName_virtual(const char *); - void On_inName_SwBracket_Left(const char *); - void On_inName_DoubleColon(const char *); - void On_inName_Comma(const char *); + void On_inName_Identifier(const char *); + void On_inName_virtual(const char *); + void On_inName_SwBracket_Left(const char *); + void On_inName_DoubleColon(const char *); + void On_inName_Comma(const char *); - Base & CurObject(); + Base & CurObject(); // DATA Dyn< PeStatusArray<PE_Base> > pStati; - Dyn<SP_Type> pSpType; /// till "{" incl. - Dyn<SPU_BaseName> pSpuBaseName; + Dyn<SP_Type> pSpType; /// till "{" incl. + Dyn<SPU_BaseName> pSpuBaseName; - BaseList aBaseIds; + BaseList aBaseIds; }; diff --git a/autodoc/source/parser/cpp/pe_class.cxx b/autodoc/source/parser/cpp/pe_class.cxx index 1b4910aff9be..5a4d24655deb 100644 --- a/autodoc/source/parser/cpp/pe_class.cxx +++ b/autodoc/source/parser/cpp/pe_class.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 @@ -75,15 +75,15 @@ PE_Class::PE_Class(Cpp_PE * i_pParent ) pSpIgnore = new SP_Ignore(*this); pSpDefs = new SP_Defines(*this); - pSpuBase = new SPU_Base(*pSpBase, 0, &PE_Class::SpReturn_Base); - pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0); + pSpuBase = new SPU_Base(*pSpBase, 0, &PE_Class::SpReturn_Base); + pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0); pSpuVarFunc = new SPU_VarFunc(*pSpVarFunc, 0, 0); pSpuTemplate= new SPU_Ignore(*pSpIgnore, 0, 0); pSpuUsing = new SPU_Ignore(*pSpIgnore, 0, 0); pSpuIgnoreFailure = new SPU_Ignore(*pSpIgnore, 0, 0); - pSpuDefs = new SPU_Defines(*pSpDefs, 0, 0); + pSpuDefs = new SPU_Defines(*pSpDefs, 0, 0); } @@ -92,7 +92,7 @@ PE_Class::~PE_Class() } void -PE_Class::Call_Handler( const cpp::Token & i_rTok ) +PE_Class::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } @@ -107,32 +107,32 @@ PE_Class::Handle_ChildFailure() void PE_Class::Setup_StatusFunctions() { - typedef CallFunction<PE_Class>::F_Tok F_Tok; + typedef CallFunction<PE_Class>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_Class::On_start_class, + static F_Tok stateF_start[] = { &PE_Class::On_start_class, &PE_Class::On_start_struct, &PE_Class::On_start_union }; - static INT16 stateT_start[] = { Tid_class, + static INT16 stateT_start[] = { Tid_class, Tid_struct, Tid_union }; - static F_Tok stateF_expectName[] = { &PE_Class::On_expectName_Identifier, + static F_Tok stateF_expectName[] = { &PE_Class::On_expectName_Identifier, &PE_Class::On_expectName_SwBracket_Left, &PE_Class::On_expectName_Colon }; - static INT16 stateT_expectName[] = { Tid_Identifier, + static INT16 stateT_expectName[] = { Tid_Identifier, Tid_SwBracket_Left, Tid_Colon }; - static F_Tok stateF_gotName[] = { &PE_Class::On_gotName_SwBracket_Left, + static F_Tok stateF_gotName[] = { &PE_Class::On_gotName_SwBracket_Left, &PE_Class::On_gotName_Semicolon, &PE_Class::On_gotName_Colon }; - static INT16 stateT_gotName[] = { Tid_SwBracket_Left, + static INT16 stateT_gotName[] = { Tid_SwBracket_Left, Tid_Semicolon, Tid_Colon }; - static F_Tok stateF_bodyStd[] = { &PE_Class::On_bodyStd_VarFunc, + static F_Tok stateF_bodyStd[] = { &PE_Class::On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc, &PE_Class::On_bodyStd_ClassKey, &PE_Class::On_bodyStd_ClassKey, @@ -166,7 +166,7 @@ PE_Class::Setup_StatusFunctions() &PE_Class::On_bodyStd_VarFunc, &PE_Class::On_bodyStd_VarFunc, }; - static INT16 stateT_bodyStd[] = { Tid_Identifier, + static INT16 stateT_bodyStd[] = { Tid_Identifier, Tid_operator, Tid_class, Tid_struct, @@ -200,11 +200,11 @@ PE_Class::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - static F_Tok stateF_inProtection[] = { &PE_Class::On_inProtection_Colon }; - static INT16 stateT_inProtection[] = { Tid_Colon }; + static F_Tok stateF_inProtection[] = { &PE_Class::On_inProtection_Colon }; + static INT16 stateT_inProtection[] = { Tid_Colon }; - static F_Tok stateF_afterDecl[] = { &PE_Class::On_afterDecl_Semicolon }; - static INT16 stateT_afterDecl[] = { Tid_Semicolon }; + static F_Tok stateF_afterDecl[] = { &PE_Class::On_afterDecl_Semicolon }; + static INT16 stateT_afterDecl[] = { Tid_Semicolon }; SEMPARSE_CREATE_STATUS(PE_Class, start, Hdl_SyntaxError); SEMPARSE_CREATE_STATUS(PE_Class, expectName, Hdl_SyntaxError); @@ -381,14 +381,14 @@ PE_Class::On_bodyStd_VarFunc( const char * ) void PE_Class::On_bodyStd_ClassKey( const char * ) { - pSpuVarFunc->Push(not_done); // This is correct, + pSpuVarFunc->Push(not_done); // This is correct, // classes are parsed via PE_Type. } void PE_Class::On_bodyStd_enum( const char * ) { - pSpuVarFunc->Push(not_done); // This is correct, + pSpuVarFunc->Push(not_done); // This is correct, // enums are parsed via PE_Type. } diff --git a/autodoc/source/parser/cpp/pe_class.hxx b/autodoc/source/parser/cpp/pe_class.hxx index d94123a26265..518594ed787e 100644 --- a/autodoc/source/parser/cpp/pe_class.hxx +++ b/autodoc/source/parser/cpp/pe_class.hxx @@ -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 @@ -71,10 +71,10 @@ class PE_Class : public cpp::Cpp_PE public: enum E_State { - start, /// before class, struct or union - expectName, /// after class, struct or union - gotName, /// after name, before : or { - bodyStd, /// after { + start, /// before class, struct or union + expectName, /// after class, struct or union + gotName, /// after name, before : or { + bodyStd, /// after { inProtection, /// after public, protected or private and before ":" afterDecl, /// after ending } size_of_states @@ -82,114 +82,114 @@ class PE_Class : public cpp::Cpp_PE enum E_KindOfResult { - is_declaration, // normal + is_declaration, // normal is_implicit_declaration, // like in: class Abc { public int n; } aAbc; - is_predeclaration, // like: class Abc; - is_qualified_typename // like in: class Abc * fx(); + is_predeclaration, // like: class Abc; + is_qualified_typename // like in: class Abc * fx(); }; PE_Class( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Class(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); virtual Cpp_PE * Handle_ChildFailure(); - E_KindOfResult Result_KindOf() const; - const String & Result_LocalName() const; - const String & Result_FirstNameSegment() const; + E_KindOfResult Result_KindOf() const; + const String & Result_LocalName() const; + const String & Result_FirstNameSegment() const; private: - typedef SubPe< PE_Class, PE_Base > SP_Base; -// typedef SubPe< PE_Class, PE_Enum> SP_Enum; - typedef SubPe< PE_Class, PE_Typedef> SP_Typedef; - typedef SubPe< PE_Class, PE_VarFunc> SP_VarFunc; - typedef SubPe< PE_Class, PE_Ignore > SP_Ignore; - typedef SubPe< PE_Class, PE_Defines> SP_Defines; - - typedef SubPeUse< PE_Class, PE_Base> SPU_Base; -// typedef SubPeUse< PE_Class, PE_Enum> SPU_Enum; - typedef SubPeUse< PE_Class, PE_Typedef> SPU_Typedef; - typedef SubPeUse< PE_Class, PE_VarFunc> SPU_VarFunc; - typedef SubPeUse< PE_Class, PE_Ignore> SPU_Ignore; - typedef SubPeUse< PE_Class, PE_Defines> SPU_Defines; + typedef SubPe< PE_Class, PE_Base > SP_Base; +// typedef SubPe< PE_Class, PE_Enum> SP_Enum; + typedef SubPe< PE_Class, PE_Typedef> SP_Typedef; + typedef SubPe< PE_Class, PE_VarFunc> SP_VarFunc; + typedef SubPe< PE_Class, PE_Ignore > SP_Ignore; + typedef SubPe< PE_Class, PE_Defines> SP_Defines; + + typedef SubPeUse< PE_Class, PE_Base> SPU_Base; +// typedef SubPeUse< PE_Class, PE_Enum> SPU_Enum; + typedef SubPeUse< PE_Class, PE_Typedef> SPU_Typedef; + typedef SubPeUse< PE_Class, PE_VarFunc> SPU_VarFunc; + typedef SubPeUse< PE_Class, PE_Ignore> SPU_Ignore; + typedef SubPeUse< PE_Class, PE_Defines> SPU_Defines; typedef ary::cpp::List_Bases BaseList; typedef ary::cpp::S_Classes_Base Base; typedef ary::cpp::E_Protection E_Protection; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); - void Init_CurObject(); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); + void Init_CurObject(); - void SpReturn_Base(); + void SpReturn_Base(); - void On_start_class( const char * ); - void On_start_struct( const char * ); - void On_start_union( const char * ); + void On_start_class( const char * ); + void On_start_struct( const char * ); + void On_start_union( const char * ); - void On_expectName_Identifier( const char * ); - void On_expectName_SwBracket_Left( const char * ); - void On_expectName_Colon( const char * ); + void On_expectName_Identifier( const char * ); + void On_expectName_SwBracket_Left( const char * ); + void On_expectName_Colon( const char * ); - void On_gotName_SwBracket_Left( const char * ); - void On_gotName_Semicolon( const char * ); - void On_gotName_Colon( const char * ); + void On_gotName_SwBracket_Left( const char * ); + void On_gotName_Semicolon( const char * ); + void On_gotName_Colon( const char * ); void On_gotName_Return2Type( const char * ); - void On_bodyStd_VarFunc( const char * ); - void On_bodyStd_ClassKey( const char * ); - void On_bodyStd_enum( const char * ); - void On_bodyStd_typedef( const char * ); - void On_bodyStd_public( const char * ); - void On_bodyStd_protected( const char * ); - void On_bodyStd_private( const char * ); - void On_bodyStd_template( const char * ); - void On_bodyStd_friend( const char * ); - void On_bodyStd_using( const char * ); - void On_bodyStd_SwBracket_Right( const char * ); - void On_bodyStd_DefineName(const char * ); - void On_bodyStd_MacroName(const char * ); - - void On_inProtection_Colon( const char * ); - - void On_afterDecl_Semicolon( const char * ); + void On_bodyStd_VarFunc( const char * ); + void On_bodyStd_ClassKey( const char * ); + void On_bodyStd_enum( const char * ); + void On_bodyStd_typedef( const char * ); + void On_bodyStd_public( const char * ); + void On_bodyStd_protected( const char * ); + void On_bodyStd_private( const char * ); + void On_bodyStd_template( const char * ); + void On_bodyStd_friend( const char * ); + void On_bodyStd_using( const char * ); + void On_bodyStd_SwBracket_Right( const char * ); + void On_bodyStd_DefineName(const char * ); + void On_bodyStd_MacroName(const char * ); + + void On_inProtection_Colon( const char * ); + + void On_afterDecl_Semicolon( const char * ); void On_afterDecl_Return2Type( const char * ); // DATA Dyn< PeStatusArray<PE_Class> > pStati; - Dyn<SP_Base> pSpBase; -// Dyn<SP_Enum> pSpEnum; - Dyn<SP_Typedef> pSpTypedef; - Dyn<SP_VarFunc> pSpVarFunc; - Dyn<SP_Ignore> pSpIgnore; - Dyn<SP_Defines> pSpDefs; + Dyn<SP_Base> pSpBase; +// Dyn<SP_Enum> pSpEnum; + Dyn<SP_Typedef> pSpTypedef; + Dyn<SP_VarFunc> pSpVarFunc; + Dyn<SP_Ignore> pSpIgnore; + Dyn<SP_Defines> pSpDefs; - Dyn<SPU_Base> pSpuBase; -// Dyn<SPU_Enum> pSpuEnum; - Dyn<SPU_Typedef> pSpuTypedef; - Dyn<SPU_VarFunc> pSpuVarFunc; + Dyn<SPU_Base> pSpuBase; +// Dyn<SPU_Enum> pSpuEnum; + Dyn<SPU_Typedef> pSpuTypedef; + Dyn<SPU_VarFunc> pSpuVarFunc; - Dyn<SPU_Ignore> pSpuTemplate; - Dyn<SPU_Ignore> pSpuUsing; - Dyn<SPU_Ignore> pSpuIgnoreFailure; - Dyn<SPU_Defines> pSpuDefs; + Dyn<SPU_Ignore> pSpuTemplate; + Dyn<SPU_Ignore> pSpuUsing; + Dyn<SPU_Ignore> pSpuIgnoreFailure; + Dyn<SPU_Defines> pSpuDefs; String sLocalName; ary::cpp::E_ClassKey eClassKey; - ary::cpp::Class * pCurObject; + ary::cpp::Class * pCurObject; BaseList aBases; - E_KindOfResult eResult_KindOf; + E_KindOfResult eResult_KindOf; }; @@ -240,7 +240,7 @@ public, protected, private -> Protection declaration friend - -> Friend Class + -> Friend Class -> Friend Function virtual diff --git a/autodoc/source/parser/cpp/pe_defs.cxx b/autodoc/source/parser/cpp/pe_defs.cxx index d599ea9de1eb..fc2515336cf7 100644 --- a/autodoc/source/parser/cpp/pe_defs.cxx +++ b/autodoc/source/parser/cpp/pe_defs.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 @@ -68,16 +68,16 @@ PE_Defines::Call_Handler( const cpp::Token & i_rTok ) void PE_Defines::Setup_StatusFunctions() { - typedef CallFunction<PE_Defines>::F_Tok F_Tok; - static F_Tok stateF_expectName[] = { &PE_Defines::On_expectName_DefineName, + typedef CallFunction<PE_Defines>::F_Tok F_Tok; + static F_Tok stateF_expectName[] = { &PE_Defines::On_expectName_DefineName, &PE_Defines::On_expectName_MacroName }; - static INT16 stateT_expectName[] = { Tid_DefineName, + static INT16 stateT_expectName[] = { Tid_DefineName, Tid_MacroName }; static F_Tok stateF_gotDefineName[] = { &PE_Defines::On_gotDefineName_PreProDefinition }; - static INT16 stateT_gotDefineName[] = { Tid_PreProDefinition }; + static INT16 stateT_gotDefineName[] = { Tid_PreProDefinition }; static F_Tok stateF_expectMacroParameters[] = { &PE_Defines::On_expectMacroParameters_MacroParameter, diff --git a/autodoc/source/parser/cpp/pe_defs.hxx b/autodoc/source/parser/cpp/pe_defs.hxx index 955dadef7828..b179dda868f8 100644 --- a/autodoc/source/parser/cpp/pe_defs.hxx +++ b/autodoc/source/parser/cpp/pe_defs.hxx @@ -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 @@ -58,22 +58,22 @@ class PE_Defines : public cpp::Cpp_PE }; PE_Defines( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Defines(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void On_expectName_DefineName( const char * ); - void On_expectName_MacroName( const char * ); + void On_expectName_DefineName( const char * ); + void On_expectName_MacroName( const char * ); - void On_gotDefineName_PreProDefinition( const char * ); + void On_gotDefineName_PreProDefinition( const char * ); void On_expectMacroParameters_MacroParameter( const char * ); void On_expectMacroParameters_PreProDefinition( const char * ); diff --git a/autodoc/source/parser/cpp/pe_enum.cxx b/autodoc/source/parser/cpp/pe_enum.cxx index b56ffc96380b..abed323dcc4e 100644 --- a/autodoc/source/parser/cpp/pe_enum.cxx +++ b/autodoc/source/parser/cpp/pe_enum.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 @@ -53,7 +53,7 @@ PE_Enum::PE_Enum(Cpp_PE * i_pParent ) Setup_StatusFunctions(); pSpValue = new SP_EnumValue(*this); - pSpuValue = new SPU_EnumValue(*pSpValue, 0, 0); + pSpuValue = new SPU_EnumValue(*pSpValue, 0, 0); } @@ -70,24 +70,24 @@ PE_Enum::Call_Handler( const cpp::Token & i_rTok ) void PE_Enum::Setup_StatusFunctions() { - typedef CallFunction<PE_Enum>::F_Tok F_Tok; - static F_Tok stateF_expectName[] = { &PE_Enum::On_expectName_Identifier, + typedef CallFunction<PE_Enum>::F_Tok F_Tok; + static F_Tok stateF_expectName[] = { &PE_Enum::On_expectName_Identifier, &PE_Enum::On_expectName_SwBracket_Left }; - static INT16 stateT_expectName[] = { Tid_Identifier, + static INT16 stateT_expectName[] = { Tid_Identifier, Tid_SwBracket_Left }; - static F_Tok stateF_gotName[] = { &PE_Enum::On_gotName_SwBracket_Left }; - static INT16 stateT_gotName[] = { Tid_SwBracket_Left }; + static F_Tok stateF_gotName[] = { &PE_Enum::On_gotName_SwBracket_Left }; + static INT16 stateT_gotName[] = { Tid_SwBracket_Left }; - static F_Tok stateF_bodyStd[] = { &PE_Enum::On_bodyStd_Identifier, + static F_Tok stateF_bodyStd[] = { &PE_Enum::On_bodyStd_Identifier, &PE_Enum::On_bodyStd_SwBracket_Right }; - static INT16 stateT_bodyStd[] = { Tid_Identifier, + static INT16 stateT_bodyStd[] = { Tid_Identifier, Tid_SwBracket_Right }; - static F_Tok stateF_afterBlock[] = { &PE_Enum::On_afterBlock_Semicolon }; - static INT16 stateT_afterBlock[] = { Tid_Semicolon }; + static F_Tok stateF_afterBlock[] = { &PE_Enum::On_afterBlock_Semicolon }; + static INT16 stateT_afterBlock[] = { Tid_Semicolon }; SEMPARSE_CREATE_STATUS(PE_Enum, expectName, Hdl_SyntaxError); SEMPARSE_CREATE_STATUS(PE_Enum, gotName, On_gotName_Return2Type); diff --git a/autodoc/source/parser/cpp/pe_enum.hxx b/autodoc/source/parser/cpp/pe_enum.hxx index 8d7484a9a6df..8cae60ce9dd1 100644 --- a/autodoc/source/parser/cpp/pe_enum.hxx +++ b/autodoc/source/parser/cpp/pe_enum.hxx @@ -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 @@ -52,62 +52,62 @@ class PE_Enum : public cpp::Cpp_PE public: enum E_State { - expectName, /// after "enum" - gotName, /// after name, before : or { - bodyStd, /// after { + expectName, /// after "enum" + gotName, /// after name, before : or { + bodyStd, /// after { afterBlock, /// after ending } size_of_states }; enum E_KindOfResult { - is_declaration, // normal + is_declaration, // normal is_implicit_declaration, // like in: enum Abc { rot, gelb, blau } aAbc; - is_qualified_typename // like in: enum Abc * fx(); + is_qualified_typename // like in: enum Abc * fx(); }; PE_Enum( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Enum(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); - E_KindOfResult Result_KindOf() const; - const String & Result_LocalName() const; - const String & Result_FirstNameSegment() const; + E_KindOfResult Result_KindOf() const; + const String & Result_LocalName() const; + const String & Result_FirstNameSegment() const; private: - typedef SubPe< PE_Enum, PE_EnumValue > SP_EnumValue; - typedef SubPeUse< PE_Enum, PE_EnumValue> SPU_EnumValue; + typedef SubPe< PE_Enum, PE_EnumValue > SP_EnumValue; + typedef SubPeUse< PE_Enum, PE_EnumValue> SPU_EnumValue; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void On_expectName_Identifier( const char * ); - void On_expectName_SwBracket_Left( const char * ); + void On_expectName_Identifier( const char * ); + void On_expectName_SwBracket_Left( const char * ); - void On_gotName_SwBracket_Left( const char * ); + void On_gotName_SwBracket_Left( const char * ); void On_gotName_Return2Type( const char * ); - void On_bodyStd_Identifier( const char * ); - void On_bodyStd_SwBracket_Right( const char * ); + void On_bodyStd_Identifier( const char * ); + void On_bodyStd_SwBracket_Right( const char * ); - void On_afterBlock_Semicolon( const char * ); - void On_afterBlock_Return2Type( const char * ); + void On_afterBlock_Semicolon( const char * ); + void On_afterBlock_Return2Type( const char * ); // DATA Dyn< PeStatusArray<PE_Enum> > pStati; - Dyn<SP_EnumValue> pSpValue; - Dyn<SPU_EnumValue> pSpuValue; + Dyn<SP_EnumValue> pSpValue; + Dyn<SPU_EnumValue> pSpuValue; String sLocalName; - ary::cpp::Enum * pCurObject; + ary::cpp::Enum * pCurObject; - E_KindOfResult eResult_KindOf; + E_KindOfResult eResult_KindOf; }; diff --git a/autodoc/source/parser/cpp/pe_enval.cxx b/autodoc/source/parser/cpp/pe_enval.cxx index 0480047fb10b..88b09779dbd2 100644 --- a/autodoc/source/parser/cpp/pe_enval.cxx +++ b/autodoc/source/parser/cpp/pe_enval.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 @@ -58,7 +58,7 @@ PE_EnumValue::~PE_EnumValue() } void -PE_EnumValue::Call_Handler( const cpp::Token & i_rTok ) +PE_EnumValue::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } @@ -66,21 +66,21 @@ PE_EnumValue::Call_Handler( const cpp::Token & i_rTok ) void PE_EnumValue::Setup_StatusFunctions() { - typedef CallFunction<PE_EnumValue>::F_Tok F_Tok; + typedef CallFunction<PE_EnumValue>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_EnumValue::On_start_Identifier }; - static INT16 stateT_start[] = { Tid_Identifier }; + static F_Tok stateF_start[] = { &PE_EnumValue::On_start_Identifier }; + static INT16 stateT_start[] = { Tid_Identifier }; - static F_Tok stateF_afterName[] = { &PE_EnumValue::On_afterName_SwBracket_Right, + static F_Tok stateF_afterName[] = { &PE_EnumValue::On_afterName_SwBracket_Right, &PE_EnumValue::On_afterName_Comma, &PE_EnumValue::On_afterName_Assign }; - static INT16 stateT_afterName[] = { Tid_SwBracket_Right, + static INT16 stateT_afterName[] = { Tid_SwBracket_Right, Tid_Comma, Tid_Assign }; - static F_Tok stateF_expectFinish[] = { &PE_EnumValue::On_expectFinish_SwBracket_Right, + static F_Tok stateF_expectFinish[] = { &PE_EnumValue::On_expectFinish_SwBracket_Right, &PE_EnumValue::On_expectFinish_Comma }; - static INT16 stateT_expectFinish[] = { Tid_SwBracket_Right, + static INT16 stateT_expectFinish[] = { Tid_SwBracket_Right, Tid_Comma }; SEMPARSE_CREATE_STATUS(PE_EnumValue, start, Hdl_SyntaxError); diff --git a/autodoc/source/parser/cpp/pe_enval.hxx b/autodoc/source/parser/cpp/pe_enval.hxx index 5cfdd5f447af..dde11b137e28 100644 --- a/autodoc/source/parser/cpp/pe_enval.hxx +++ b/autodoc/source/parser/cpp/pe_enval.hxx @@ -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 @@ -52,35 +52,35 @@ class PE_EnumValue : public Cpp_PE { start, // before name afterName, - expectFinish, // after init-expression + expectFinish, // after init-expression size_of_states }; PE_EnumValue( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_EnumValue(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_EnumValue, PE_Expression > SP_Expression; - typedef SubPeUse< PE_EnumValue, PE_Expression> SPU_Expression; + typedef SubPe< PE_EnumValue, PE_Expression > SP_Expression; + typedef SubPeUse< PE_EnumValue, PE_Expression> SPU_Expression; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError(const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError(const char *); void SpReturn_InitExpression(); - void On_start_Identifier(const char * ); + void On_start_Identifier(const char * ); - void On_afterName_SwBracket_Right(const char * ); - void On_afterName_Comma(const char * ); - void On_afterName_Assign(const char * ); + void On_afterName_SwBracket_Right(const char * ); + void On_afterName_Comma(const char * ); + void On_afterName_Assign(const char * ); - void On_expectFinish_SwBracket_Right(const char * ); - void On_expectFinish_Comma(const char * ); + void On_expectFinish_SwBracket_Right(const char * ); + void On_expectFinish_Comma(const char * ); // DATA Dyn< PeStatusArray<PE_EnumValue> > @@ -88,7 +88,7 @@ class PE_EnumValue : public Cpp_PE Dyn<SP_Expression> pSpExpression; Dyn<SPU_Expression> pSpuInitExpression; - String sName; + String sName; String sInitExpression; }; diff --git a/autodoc/source/parser/cpp/pe_expr.cxx b/autodoc/source/parser/cpp/pe_expr.cxx index 0594e57077c5..9a34a86b8798 100644 --- a/autodoc/source/parser/cpp/pe_expr.cxx +++ b/autodoc/source/parser/cpp/pe_expr.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 @@ -60,9 +60,9 @@ PE_Expression::Call_Handler( const cpp::Token & i_rTok ) void PE_Expression::Setup_StatusFunctions() { - typedef CallFunction<PE_Expression>::F_Tok F_Tok; + typedef CallFunction<PE_Expression>::F_Tok F_Tok; - static F_Tok stateF_std[] = { &PE_Expression::On_std_SwBracket_Left, + static F_Tok stateF_std[] = { &PE_Expression::On_std_SwBracket_Left, &PE_Expression::On_std_SwBracket_Right, &PE_Expression::On_std_ArrayBracket_Left, &PE_Expression::On_std_ArrayBracket_Right, @@ -70,7 +70,7 @@ PE_Expression::Setup_StatusFunctions() &PE_Expression::On_std_Bracket_Right, &PE_Expression::On_std_Semicolon, &PE_Expression::On_std_Comma }; - static INT16 stateT_std[] = { Tid_SwBracket_Left, + static INT16 stateT_std[] = { Tid_SwBracket_Left, Tid_SwBracket_Right, Tid_ArrayBracket_Left, Tid_ArrayBracket_Right, diff --git a/autodoc/source/parser/cpp/pe_expr.hxx b/autodoc/source/parser/cpp/pe_expr.hxx index 8c1b5a94af9d..293651833e3a 100644 --- a/autodoc/source/parser/cpp/pe_expr.hxx +++ b/autodoc/source/parser/cpp/pe_expr.hxx @@ -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 @@ -53,19 +53,19 @@ class PE_Expression : public Cpp_PE size_of_states }; PE_Expression( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Expression(); const char * Result_Text() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void On_std_Default( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void On_std_Default( const char *); void On_std_SwBracket_Left( const char *); void On_std_SwBracket_Right( const char *); diff --git a/autodoc/source/parser/cpp/pe_file.cxx b/autodoc/source/parser/cpp/pe_file.cxx index 6160f97b89b8..78e9898d7f17 100644 --- a/autodoc/source/parser/cpp/pe_file.cxx +++ b/autodoc/source/parser/cpp/pe_file.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 @@ -71,12 +71,12 @@ PE_File::PE_File( cpp::PeEnvironment & io_rEnv) pSpDefs = new SP_Defines(*this); pSpIgnore = new SP_Ignore(*this); - pSpuNamespace = new SPU_Namespace(*pSpNamespace, 0, 0); - pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0); - pSpuVarFunc = new SPU_VarFunc(*pSpVarFunc, 0, &PE_File::SpReturn_VarFunc); - pSpuTemplate = new SPU_Template(*pSpTemplate, 0, &PE_File::SpReturn_Template); - pSpuDefs = new SPU_Defines(*pSpDefs, 0, 0); - pSpuUsing = new SPU_Ignore(*pSpIgnore, 0, 0); + pSpuNamespace = new SPU_Namespace(*pSpNamespace, 0, 0); + pSpuTypedef = new SPU_Typedef(*pSpTypedef, 0, 0); + pSpuVarFunc = new SPU_VarFunc(*pSpVarFunc, 0, &PE_File::SpReturn_VarFunc); + pSpuTemplate = new SPU_Template(*pSpTemplate, 0, &PE_File::SpReturn_Template); + pSpuDefs = new SPU_Defines(*pSpDefs, 0, 0); + pSpuUsing = new SPU_Ignore(*pSpIgnore, 0, 0); pSpuIgnoreFailure = new SPU_Ignore(*pSpIgnore, 0, 0); } @@ -86,7 +86,7 @@ PE_File::~PE_File() } void -PE_File::Call_Handler( const cpp::Token & i_rTok ) +PE_File::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } @@ -101,8 +101,8 @@ PE_File::Handle_ChildFailure() void PE_File::Setup_StatusFunctions() { - typedef CallFunction<PE_File>::F_Tok F_Tok; - static F_Tok stateF_std[] = { &PE_File::On_std_VarFunc, + typedef CallFunction<PE_File>::F_Tok F_Tok; + static F_Tok stateF_std[] = { &PE_File::On_std_VarFunc, &PE_File::On_std_ClassKey, &PE_File::On_std_ClassKey, &PE_File::On_std_ClassKey, @@ -129,7 +129,7 @@ PE_File::Setup_StatusFunctions() &PE_File::On_std_VarFunc, &PE_File::On_std_VarFunc }; - static INT16 stateT_std[] = { Tid_Identifier, + static INT16 stateT_std[] = { Tid_Identifier, Tid_class, Tid_struct, Tid_union, @@ -156,10 +156,10 @@ PE_File::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - static F_Tok stateF_in_extern[] = { &PE_File::On_in_extern_Constant }; + static F_Tok stateF_in_extern[] = { &PE_File::On_in_extern_Constant }; static INT16 stateT_in_extern[] = { Tid_Constant }; - static F_Tok stateF_in_externC[] = { &PE_File::On_in_externC_SwBracket_Left }; + static F_Tok stateF_in_externC[] = { &PE_File::On_in_externC_SwBracket_Left }; static INT16 stateT_in_externC[] = { Tid_SwBracket_Left }; @@ -221,7 +221,7 @@ PE_File::On_std_namespace(const char * ) void PE_File::On_std_ClassKey(const char * ) { - pSpuVarFunc->Push(not_done); // This is correct, + pSpuVarFunc->Push(not_done); // This is correct, // classes are parsed via PE_Type. } @@ -234,7 +234,7 @@ PE_File::On_std_typedef(const char * ) void PE_File::On_std_enum(const char * ) { - pSpuVarFunc->Push(not_done); // This is correct, + pSpuVarFunc->Push(not_done); // This is correct, // enums are parsed via PE_Type. } diff --git a/autodoc/source/parser/cpp/pe_file.hxx b/autodoc/source/parser/cpp/pe_file.hxx index 7a36f2c6fe9c..b8d15abe3f95 100644 --- a/autodoc/source/parser/cpp/pe_file.hxx +++ b/autodoc/source/parser/cpp/pe_file.hxx @@ -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 @@ -57,7 +57,7 @@ class PE_File : public Cpp_PE public: enum E_State { - std, /// before class, struct or union + std, /// before class, struct or union in_extern, in_externC, size_of_states @@ -67,45 +67,45 @@ class PE_File : public Cpp_PE PeEnvironment & io_rEnv ); ~PE_File(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); virtual Cpp_PE * Handle_ChildFailure(); private: - typedef SubPe< PE_File, PE_Namespace> SP_Namespace; - typedef SubPe< PE_File, PE_Typedef> SP_Typedef; - typedef SubPe< PE_File, PE_VarFunc> SP_VarFunc; - typedef SubPe< PE_File, PE_TemplateTop> SP_Template; - typedef SubPe< PE_File, PE_Defines> SP_Defines; - typedef SubPe< PE_File, PE_Ignore > SP_Ignore; + typedef SubPe< PE_File, PE_Namespace> SP_Namespace; + typedef SubPe< PE_File, PE_Typedef> SP_Typedef; + typedef SubPe< PE_File, PE_VarFunc> SP_VarFunc; + typedef SubPe< PE_File, PE_TemplateTop> SP_Template; + typedef SubPe< PE_File, PE_Defines> SP_Defines; + typedef SubPe< PE_File, PE_Ignore > SP_Ignore; typedef SubPeUse< PE_File, PE_Namespace> SPU_Namespace; - typedef SubPeUse< PE_File, PE_Typedef> SPU_Typedef; - typedef SubPeUse< PE_File, PE_VarFunc> SPU_VarFunc; - typedef SubPeUse< PE_File, PE_TemplateTop> SPU_Template; - typedef SubPeUse< PE_File, PE_Defines> SPU_Defines; - typedef SubPeUse< PE_File, PE_Ignore> SPU_Ignore; - - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); - - void SpReturn_VarFunc(); - void SpReturn_Template(); - - void On_std_namespace(const char * i_sText); - void On_std_ClassKey(const char * i_sText); - void On_std_typedef(const char * i_sText); - void On_std_enum(const char * i_sText); - void On_std_VarFunc(const char * i_sText); - void On_std_template(const char * i_sText); - void On_std_extern(const char * i_sText); - void On_std_using(const char * i_sText); - void On_std_SwBracketRight(const char * i_sText); - - void On_std_DefineName(const char * i_sText); - void On_std_MacroName(const char * i_sText); + typedef SubPeUse< PE_File, PE_Typedef> SPU_Typedef; + typedef SubPeUse< PE_File, PE_VarFunc> SPU_VarFunc; + typedef SubPeUse< PE_File, PE_TemplateTop> SPU_Template; + typedef SubPeUse< PE_File, PE_Defines> SPU_Defines; + typedef SubPeUse< PE_File, PE_Ignore> SPU_Ignore; + + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); + + void SpReturn_VarFunc(); + void SpReturn_Template(); + + void On_std_namespace(const char * i_sText); + void On_std_ClassKey(const char * i_sText); + void On_std_typedef(const char * i_sText); + void On_std_enum(const char * i_sText); + void On_std_VarFunc(const char * i_sText); + void On_std_template(const char * i_sText); + void On_std_extern(const char * i_sText); + void On_std_using(const char * i_sText); + void On_std_SwBracketRight(const char * i_sText); + + void On_std_DefineName(const char * i_sText); + void On_std_MacroName(const char * i_sText); void On_in_extern_Constant(const char * i_sText); void On_in_extern_Ignore(const char * i_sText); @@ -116,27 +116,27 @@ class PE_File : public Cpp_PE // DATA - PeEnvironment * pEnv; + PeEnvironment * pEnv; Dyn< PeStatusArray<PE_File> > pStati; - Dyn<SP_Namespace> pSpNamespace; - Dyn<SP_Typedef> pSpTypedef; - Dyn<SP_VarFunc> pSpVarFunc; - Dyn<SP_Template> pSpTemplate; - Dyn<SP_Defines> pSpDefs; + Dyn<SP_Namespace> pSpNamespace; + Dyn<SP_Typedef> pSpTypedef; + Dyn<SP_VarFunc> pSpVarFunc; + Dyn<SP_Template> pSpTemplate; + Dyn<SP_Defines> pSpDefs; - Dyn<SP_Ignore> pSpIgnore; + Dyn<SP_Ignore> pSpIgnore; - Dyn<SPU_Namespace> pSpuNamespace; - Dyn<SPU_Typedef> pSpuTypedef; - Dyn<SPU_VarFunc> pSpuVarFunc; - Dyn<SPU_Template> pSpuTemplate; - Dyn<SPU_Defines> pSpuDefs; + Dyn<SPU_Namespace> pSpuNamespace; + Dyn<SPU_Typedef> pSpuTypedef; + Dyn<SPU_VarFunc> pSpuVarFunc; + Dyn<SPU_Template> pSpuTemplate; + Dyn<SPU_Defines> pSpuDefs; - Dyn<SPU_Ignore> pSpuUsing; - Dyn<SPU_Ignore> pSpuIgnoreFailure; + Dyn<SPU_Ignore> pSpuUsing; + Dyn<SPU_Ignore> pSpuIgnoreFailure; bool bWithinSingleExternC; /** After 'extern "C"' without following '{', waiting for the next function or variable to diff --git a/autodoc/source/parser/cpp/pe_funct.cxx b/autodoc/source/parser/cpp/pe_funct.cxx index 081f369a0c9c..c5e1ff8b3c47 100644 --- a/autodoc/source/parser/cpp/pe_funct.cxx +++ b/autodoc/source/parser/cpp/pe_funct.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 @@ -80,9 +80,9 @@ PE_Function::PE_Function( Cpp_PE * i_pParent ) pSpParameter = new SP_Parameter(*this); pSpType = new SP_Type(*this); - pSpuParameter = new SPU_Parameter(*pSpParameter, 0, &PE_Function::SpReturn_Parameter); - pSpuException = new SPU_Type(*pSpType, 0, &PE_Function::SpReturn_Exception); - pSpuCastOperatorType = new SPU_Type(*pSpType, &PE_Function::SpInit_CastOperatorType, &PE_Function::SpReturn_CastOperatorType); + pSpuParameter = new SPU_Parameter(*pSpParameter, 0, &PE_Function::SpReturn_Parameter); + pSpuException = new SPU_Type(*pSpType, 0, &PE_Function::SpReturn_Exception); + pSpuCastOperatorType = new SPU_Type(*pSpType, &PE_Function::SpInit_CastOperatorType, &PE_Function::SpReturn_CastOperatorType); } PE_Function::~PE_Function() @@ -164,7 +164,7 @@ PE_Function::Call_Handler( const cpp::Token & i_rTok ) void PE_Function::Setup_StatusFunctions() { - typedef CallFunction<PE_Function>::F_Tok F_Tok; + typedef CallFunction<PE_Function>::F_Tok F_Tok; static F_Tok stateF_afterStdOperator[] = { &PE_Function::On_afterOperator_Std_Operator, @@ -219,8 +219,8 @@ PE_Function::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - static F_Tok stateF_afterName[] = { &PE_Function::On_afterName_Bracket_Left }; - static INT16 stateT_afterName[] = { Tid_Bracket_Left }; + static F_Tok stateF_afterName[] = { &PE_Function::On_afterName_Bracket_Left }; + static INT16 stateT_afterName[] = { Tid_Bracket_Left }; static F_Tok stateF_expectParameterSeparator[] = { &PE_Function::On_expectParameterSeparator_BracketRight, @@ -229,7 +229,7 @@ PE_Function::Setup_StatusFunctions() { Tid_Bracket_Right, Tid_Comma }; - static F_Tok stateF_afterParameters[] = { &PE_Function::On_afterParameters_const, + static F_Tok stateF_afterParameters[] = { &PE_Function::On_afterParameters_const, &PE_Function::On_afterParameters_volatile, &PE_Function::On_afterParameters_throw, &PE_Function::On_afterParameters_SwBracket_Left, @@ -246,8 +246,8 @@ PE_Function::Setup_StatusFunctions() Tid_Colon, Tid_Assign }; - static F_Tok stateF_afterThrow[] = { &PE_Function::On_afterThrow_Bracket_Left }; - static INT16 stateT_afterThrow[] = { Tid_Bracket_Left }; + static F_Tok stateF_afterThrow[] = { &PE_Function::On_afterThrow_Bracket_Left }; + static INT16 stateT_afterThrow[] = { Tid_Bracket_Left }; static F_Tok stateF_expectExceptionSeparator[] = { &PE_Function::On_expectExceptionSeparator_BracketRight, @@ -256,7 +256,7 @@ PE_Function::Setup_StatusFunctions() { Tid_Bracket_Right, Tid_Comma }; - static F_Tok stateF_afterExceptions[] = { &PE_Function::On_afterExceptions_SwBracket_Left, + static F_Tok stateF_afterExceptions[] = { &PE_Function::On_afterExceptions_SwBracket_Left, &PE_Function::On_afterExceptions_Semicolon, &PE_Function::On_afterExceptions_Comma, &PE_Function::On_afterExceptions_Colon, @@ -267,8 +267,8 @@ PE_Function::Setup_StatusFunctions() Tid_Colon, Tid_Assign }; - static F_Tok stateF_expectZero[] = { &PE_Function::On_expectZero_Constant }; - static INT16 stateT_expectZero[] = { Tid_Constant }; + static F_Tok stateF_expectZero[] = { &PE_Function::On_expectZero_Constant }; + static INT16 stateT_expectZero[] = { Tid_Constant }; static F_Tok stateF_inImplementation[] = { &PE_Function::On_inImplementation_SwBracket_Left, diff --git a/autodoc/source/parser/cpp/pe_funct.hxx b/autodoc/source/parser/cpp/pe_funct.hxx index 20d8b5e35d5c..647180ca9c09 100644 --- a/autodoc/source/parser/cpp/pe_funct.hxx +++ b/autodoc/source/parser/cpp/pe_funct.hxx @@ -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 @@ -67,109 +67,109 @@ class PE_Function : public Cpp_PE afterStdOperatorLeftBracket, // if initializes as operator with ( or [ afterCastOperator, // if initializes as operator - afterName, // undecided - expectParameterSeparator, // + afterName, // undecided + expectParameterSeparator, // afterParameters, // before const, volatile throw or = 0. - afterThrow, // expect ( + afterThrow, // expect ( expectExceptionSeparator, // - afterExceptions, // = 0 oder ; oder , - expectZero, // after '=' + afterExceptions, // = 0 oder ; oder , + expectZero, // after '=' inImplementation, // after { size_of_states }; - typedef ary::cpp::E_Protection E_Protection; - typedef ary::cpp::E_Virtuality E_Virtuality; - typedef ary::cpp::E_ConVol E_ConVol; + typedef ary::cpp::E_Protection E_Protection; + typedef ary::cpp::E_Virtuality E_Virtuality; + typedef ary::cpp::E_ConVol E_ConVol; PE_Function( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Function(); - void Init_Std( + void Init_Std( const String & i_sName, ary::cpp::Type_id i_nReturnType, bool i_bVirtual, ary::cpp::FunctionFlags i_aFlags ); - void Init_Ctor( + void Init_Ctor( const String & i_sName, ary::cpp::FunctionFlags i_aFlags ); - void Init_Dtor( + void Init_Dtor( const String & i_sName, bool i_bVirtual, ary::cpp::FunctionFlags i_aFlags ); - void Init_CastOperator( + void Init_CastOperator( bool i_bVirtual, ary::cpp::FunctionFlags i_aFlags ); - void Init_NormalOperator( + void Init_NormalOperator( ary::cpp::Type_id i_nReturnType, bool i_bVirtual, ary::cpp::FunctionFlags i_aFlags ); ary::cpp::Ce_id Result_Id() const; - bool Result_WithImplementation() const; + bool Result_WithImplementation() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_Function, PE_Type > SP_Type; - typedef SubPeUse< PE_Function, PE_Type > SPU_Type; - typedef SubPe< PE_Function, PE_Parameter> SP_Parameter; - typedef SubPeUse<PE_Function, PE_Parameter> SPU_Parameter; + typedef SubPe< PE_Function, PE_Type > SP_Type; + typedef SubPeUse< PE_Function, PE_Type > SPU_Type; + typedef SubPe< PE_Function, PE_Parameter> SP_Parameter; + typedef SubPeUse<PE_Function, PE_Parameter> SPU_Parameter; - typedef std::vector<ary::cpp::S_Parameter> ParameterList; - typedef std::vector<ary::cpp::Type_id> ExceptionTypeList; + typedef std::vector<ary::cpp::S_Parameter> ParameterList; + typedef std::vector<ary::cpp::Type_id> ExceptionTypeList; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError(const char * i_sText); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError(const char * i_sText); - void SpInit_CastOperatorType(); + void SpInit_CastOperatorType(); - void SpReturn_Parameter(); - void SpReturn_Exception(); - void SpReturn_CastOperatorType(); + void SpReturn_Parameter(); + void SpReturn_Exception(); + void SpReturn_CastOperatorType(); - void On_afterOperator_Std_Operator(const char * i_sText); // Operator+() etc. - void On_afterOperator_Std_LeftBracket(const char * i_sText); // operator [] or () + void On_afterOperator_Std_Operator(const char * i_sText); // Operator+() etc. + void On_afterOperator_Std_LeftBracket(const char * i_sText); // operator [] or () void On_afterStdOperatorLeftBracket_RightBracket(const char * i_sText); - void On_afterOperator_Cast_Type(const char * i_sText); // Type + void On_afterOperator_Cast_Type(const char * i_sText); // Type - void On_afterName_Bracket_Left(const char * i_sText); + void On_afterName_Bracket_Left(const char * i_sText); - void On_expectParameterSeparator_BracketRight(const char * i_sText); - void On_expectParameterSeparator_Comma(const char * i_sText); + void On_expectParameterSeparator_BracketRight(const char * i_sText); + void On_expectParameterSeparator_Comma(const char * i_sText); - void On_afterParameters_const(const char * i_sText); - void On_afterParameters_volatile(const char * i_sText); - void On_afterParameters_throw(const char * i_sText); - void On_afterParameters_SwBracket_Left(const char * i_sText); - void On_afterParameters_Semicolon(const char * i_sText); - void On_afterParameters_Comma(const char * i_sText); - void On_afterParameters_Colon(const char * i_sText); - void On_afterParameters_Assign(const char * i_sText); + void On_afterParameters_const(const char * i_sText); + void On_afterParameters_volatile(const char * i_sText); + void On_afterParameters_throw(const char * i_sText); + void On_afterParameters_SwBracket_Left(const char * i_sText); + void On_afterParameters_Semicolon(const char * i_sText); + void On_afterParameters_Comma(const char * i_sText); + void On_afterParameters_Colon(const char * i_sText); + void On_afterParameters_Assign(const char * i_sText); - void On_afterThrow_Bracket_Left(const char * i_sText); + void On_afterThrow_Bracket_Left(const char * i_sText); - void On_expectExceptionSeparator_BracketRight(const char * i_sText); - void On_expectExceptionSeparator_Comma(const char * i_sText); + void On_expectExceptionSeparator_BracketRight(const char * i_sText); + void On_expectExceptionSeparator_Comma(const char * i_sText); - void On_afterExceptions_SwBracket_Left(const char * i_sText); - void On_afterExceptions_Semicolon(const char * i_sText); - void On_afterExceptions_Comma(const char * i_sText); - void On_afterExceptions_Colon(const char * i_sText); - void On_afterExceptions_Assign(const char * i_sText); + void On_afterExceptions_SwBracket_Left(const char * i_sText); + void On_afterExceptions_Semicolon(const char * i_sText); + void On_afterExceptions_Comma(const char * i_sText); + void On_afterExceptions_Colon(const char * i_sText); + void On_afterExceptions_Assign(const char * i_sText); - void On_expectZero_Constant(const char * i_sText); + void On_expectZero_Constant(const char * i_sText); - void On_inImplementation_SwBracket_Left(const char * i_sText); - void On_inImplementation_SwBracket_Right(const char * i_sText); - void On_inImplementation_Default(const char * i_sText); + void On_inImplementation_SwBracket_Left(const char * i_sText); + void On_inImplementation_SwBracket_Right(const char * i_sText); + void On_inImplementation_Default(const char * i_sText); void PerformFinishingPunctuation(); void EnterImplementation( @@ -219,16 +219,16 @@ PE_Function::Result_WithImplementation() const -/* // Overview of Stati +/* // Overview of Stati Undecided --------- -start // vor und während storage class specifiern +start // vor und während storage class specifiern ->Typ -expectName // Typ ist da +expectName // Typ ist da afterName @@ -238,14 +238,14 @@ afterName Variable -------- -start // vor und während storage class specifiern +start // vor und während storage class specifiern ->Typ -expectName // Typ ist da -> im Falle von '(': notyetimplemented +expectName // Typ ist da -> im Falle von '(': notyetimplemented afterName -expectSize // after [ +expectSize // after [ expectFinish // vor ; oder , expectNextVarName // anders als bei expectName kann hier auch * oder & kommen @@ -257,18 +257,18 @@ expectNextVarName // anders als bei expectName kann hier auch * oder & kommen Function -------- -start // vor und während storage class specifiern +start // vor und während storage class specifiern ->Typ -expectName // Typ ist da -expectBracket // Nach Name -expectParameter // nach ( oder , +expectName // Typ ist da +expectBracket // Nach Name +expectParameter // nach ( oder , -> Parameter after Parameters // before const, volatile throw or = 0. -after throw // expect ( -expectException // after ( -after exceptions // = 0 oder ; oder , +after throw // expect ( +expectException // after ( +after exceptions // = 0 oder ; oder , expectNextVarName // anders als bei expectName kann hier auch * oder & kommen diff --git a/autodoc/source/parser/cpp/pe_ignor.cxx b/autodoc/source/parser/cpp/pe_ignor.cxx index 67db5593c736..8453c8d6ed72 100644 --- a/autodoc/source/parser/cpp/pe_ignor.cxx +++ b/autodoc/source/parser/cpp/pe_ignor.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 @@ -57,15 +57,15 @@ PE_Ignore::Call_Handler( const cpp::Token & i_rTok ) { switch (i_rTok.TypeId()) { - case Tid_SwBracket_Left: SetTokenResult(done, stay); + case Tid_SwBracket_Left: SetTokenResult(done, stay); nBracketCounter++; bBlockOpened = true; break; - case Tid_Semicolon: SetTokenResult(done, pop_success); + case Tid_Semicolon: SetTokenResult(done, pop_success); break; default: SetTokenResult(done, stay); - } // end switch + } // end switch } else if ( nBracketCounter > 0 ) { @@ -73,11 +73,11 @@ PE_Ignore::Call_Handler( const cpp::Token & i_rTok ) switch (i_rTok.TypeId()) { - case Tid_SwBracket_Left: nBracketCounter++; + case Tid_SwBracket_Left: nBracketCounter++; break; - case Tid_SwBracket_Right: nBracketCounter--; + case Tid_SwBracket_Right: nBracketCounter--; break; - } // end switch + } // end switch } else if ( i_rTok.TypeId() == Tid_Semicolon ) { diff --git a/autodoc/source/parser/cpp/pe_ignor.hxx b/autodoc/source/parser/cpp/pe_ignor.hxx index 7efb2757479b..b9a1cec2ca91 100644 --- a/autodoc/source/parser/cpp/pe_ignor.hxx +++ b/autodoc/source/parser/cpp/pe_ignor.hxx @@ -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 @@ -46,19 +46,19 @@ class PE_Ignore : public Cpp_PE { public: PE_Ignore( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Ignore(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); // DATA - uintt nBracketCounter; - bool bBlockOpened; + uintt nBracketCounter; + bool bBlockOpened; }; diff --git a/autodoc/source/parser/cpp/pe_namsp.cxx b/autodoc/source/parser/cpp/pe_namsp.cxx index bf9ca483abbe..741699a229a6 100644 --- a/autodoc/source/parser/cpp/pe_namsp.cxx +++ b/autodoc/source/parser/cpp/pe_namsp.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 @@ -60,16 +60,16 @@ PE_Namespace::~PE_Namespace() void PE_Namespace::Setup_StatusFunctions() { - typedef CallFunction<PE_Namespace>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_Namespace::On_start_Identifier, + typedef CallFunction<PE_Namespace>::F_Tok F_Tok; + static F_Tok stateF_start[] = { &PE_Namespace::On_start_Identifier, &PE_Namespace::On_start_SwBracket_Left }; - static INT16 stateT_start[] = { Tid_Identifier, + static INT16 stateT_start[] = { Tid_Identifier, Tid_SwBracket_Left }; - static F_Tok stateF_gotName[] = { &PE_Namespace::On_gotName_SwBracket_Left, + static F_Tok stateF_gotName[] = { &PE_Namespace::On_gotName_SwBracket_Left, &PE_Namespace::On_gotName_Assign }; - static INT16 stateT_gotName[] = { Tid_SwBracket_Left, + static INT16 stateT_gotName[] = { Tid_SwBracket_Left, Tid_Assign }; - static F_Tok stateF_expectSemicolon[] = { &PE_Namespace::On_expectSemicolon_Semicolon }; + static F_Tok stateF_expectSemicolon[] = { &PE_Namespace::On_expectSemicolon_Semicolon }; static INT16 stateT_expectSemicolon[] = { Tid_Semicolon }; SEMPARSE_CREATE_STATUS(PE_Namespace, start, Hdl_SyntaxError); @@ -78,7 +78,7 @@ PE_Namespace::Setup_StatusFunctions() } void -PE_Namespace::Call_Handler( const cpp::Token & i_rTok ) +PE_Namespace::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } diff --git a/autodoc/source/parser/cpp/pe_namsp.hxx b/autodoc/source/parser/cpp/pe_namsp.hxx index d07ab61ad3b7..386aded56b79 100644 --- a/autodoc/source/parser/cpp/pe_namsp.hxx +++ b/autodoc/source/parser/cpp/pe_namsp.hxx @@ -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 @@ -59,37 +59,37 @@ class PE_Namespace : public Cpp_PE { start, gotName, - expectSemicolon, /// after namespace assignment + expectSemicolon, /// after namespace assignment size_of_states }; PE_Namespace( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Namespace(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); ary::cpp::Namespace * Result_OpenedNamespace() const; private: - void Setup_StatusFunctions(); + void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void On_start_Identifier(const char * i_sText); - void On_start_SwBracket_Left(const char * i_sText); - void On_gotName_SwBracket_Left(const char * i_sText); - void On_gotName_Assign(const char * i_sText); - void On_expectSemicolon_Semicolon(const char * i_sText); + void On_start_Identifier(const char * i_sText); + void On_start_SwBracket_Left(const char * i_sText); + void On_gotName_SwBracket_Left(const char * i_sText); + void On_gotName_Assign(const char * i_sText); + void On_expectSemicolon_Semicolon(const char * i_sText); // DATA Dyn< PeStatusArray<PE_Namespace> > pStati; String sLocalName; - bool bPush; + bool bPush; }; diff --git a/autodoc/source/parser/cpp/pe_param.cxx b/autodoc/source/parser/cpp/pe_param.cxx index 19ce4607d060..c00f81db836c 100644 --- a/autodoc/source/parser/cpp/pe_param.cxx +++ b/autodoc/source/parser/cpp/pe_param.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 @@ -42,7 +42,7 @@ namespace cpp { -//*********************** PE_Parameter ***********************// +//*********************** PE_Parameter ***********************// PE_Parameter::PE_Parameter( Cpp_PE * i_pParent ) @@ -75,8 +75,8 @@ PE_Parameter::Call_Handler( const cpp::Token & i_rTok ) void PE_Parameter::Setup_StatusFunctions() { - typedef CallFunction<PE_Parameter>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_Parameter::On_start_Type, + typedef CallFunction<PE_Parameter>::F_Tok F_Tok; + static F_Tok stateF_start[] = { &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type, @@ -91,7 +91,7 @@ PE_Parameter::Setup_StatusFunctions() &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type, &PE_Parameter::On_start_Type }; - static INT16 stateT_start[] = { Tid_Identifier, + static INT16 stateT_start[] = { Tid_Identifier, Tid_class, Tid_struct, Tid_union, @@ -107,27 +107,27 @@ PE_Parameter::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - static F_Tok stateF_expectName[] = { &PE_Parameter::On_expectName_Identifier, + static F_Tok stateF_expectName[] = { &PE_Parameter::On_expectName_Identifier, &PE_Parameter::On_expectName_ArrayBracket_Left, &PE_Parameter::On_expectName_Bracket_Right, &PE_Parameter::On_expectName_Comma, &PE_Parameter::On_afterName_Assign }; - static INT16 stateT_expectName[] = { Tid_Identifier, + static INT16 stateT_expectName[] = { Tid_Identifier, Tid_ArrayBracket_Left, Tid_Bracket_Right, Tid_Comma, Tid_Assign }; - static F_Tok stateF_afterName[] = { &PE_Parameter::On_afterName_ArrayBracket_Left, + static F_Tok stateF_afterName[] = { &PE_Parameter::On_afterName_ArrayBracket_Left, &PE_Parameter::On_afterName_Bracket_Right, &PE_Parameter::On_afterName_Comma, &PE_Parameter::On_afterName_Assign }; - static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, + static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, Tid_Bracket_Right, Tid_Comma, Tid_Assign }; - static F_Tok stateF_finished[] = { &PE_Parameter::On_finished_Comma, + static F_Tok stateF_finished[] = { &PE_Parameter::On_finished_Comma, &PE_Parameter::On_finished_Bracket_Right }; - static INT16 stateT_finished[] = { Tid_Bracket_Right, + static INT16 stateT_finished[] = { Tid_Bracket_Right, Tid_Comma }; SEMPARSE_CREATE_STATUS(PE_Parameter, start, Hdl_SyntaxError); diff --git a/autodoc/source/parser/cpp/pe_param.hxx b/autodoc/source/parser/cpp/pe_param.hxx index 44688796236f..a4312b41093b 100644 --- a/autodoc/source/parser/cpp/pe_param.hxx +++ b/autodoc/source/parser/cpp/pe_param.hxx @@ -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 @@ -61,57 +61,57 @@ class PE_Parameter : public Cpp_PE }; typedef ary::cpp::S_Parameter S_ParamInfo; - explicit PE_Parameter( - Cpp_PE * i_pParent ); + explicit PE_Parameter( + Cpp_PE * i_pParent ); ~PE_Parameter(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); ary::cpp::Type_id Result_FrontType() const; const S_ParamInfo & Result_ParamInfo() const; private: - typedef SubPe< PE_Parameter, PE_Type > SP_Type; - typedef SubPeUse< PE_Parameter, PE_Type > SPU_Type; - typedef SubPe< PE_Parameter, PE_Variable > SP_Variable; - typedef SubPeUse< PE_Parameter, PE_Variable > SPU_Variable; - - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); - - void SpInit_Type(); // Type and Ignore. - void SpInit_Variable(); - void SpReturn_Type(); - void SpReturn_Variable(); - - void On_start_Type(const char * i_sText); - void On_start_Bracket_Right(const char * i_sText); + typedef SubPe< PE_Parameter, PE_Type > SP_Type; + typedef SubPeUse< PE_Parameter, PE_Type > SPU_Type; + typedef SubPe< PE_Parameter, PE_Variable > SP_Variable; + typedef SubPeUse< PE_Parameter, PE_Variable > SPU_Variable; + + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); + + void SpInit_Type(); // Type and Ignore. + void SpInit_Variable(); + void SpReturn_Type(); + void SpReturn_Variable(); + + void On_start_Type(const char * i_sText); + void On_start_Bracket_Right(const char * i_sText); void On_start_Ellipse(const char * i_sText); - void On_expectName_Identifier(const char * i_sText); - void On_expectName_ArrayBracket_Left(const char * i_sText); - void On_expectName_Bracket_Right(const char * i_sText); - void On_expectName_Comma(const char * i_sText); + void On_expectName_Identifier(const char * i_sText); + void On_expectName_ArrayBracket_Left(const char * i_sText); + void On_expectName_Bracket_Right(const char * i_sText); + void On_expectName_Comma(const char * i_sText); - void On_afterName_ArrayBracket_Left(const char * i_sText); - void On_afterName_Bracket_Right(const char * i_sText); - void On_afterName_Comma(const char * i_sText); - void On_afterName_Assign(const char * i_sText); + void On_afterName_ArrayBracket_Left(const char * i_sText); + void On_afterName_Bracket_Right(const char * i_sText); + void On_afterName_Comma(const char * i_sText); + void On_afterName_Assign(const char * i_sText); - void On_finished_Bracket_Right(const char * i_sText); - void On_finished_Comma(const char * i_sText); + void On_finished_Bracket_Right(const char * i_sText); + void On_finished_Comma(const char * i_sText); // DATA Dyn< PeStatusArray<PE_Parameter> > pStati; - Dyn<SP_Type> pSpType; - Dyn<SPU_Type> pSpuType; - Dyn<SP_Variable> pSpVariable; - Dyn<SPU_Variable> pSpuVariable; + Dyn<SP_Type> pSpType; + Dyn<SPU_Type> pSpuType; + Dyn<SP_Variable> pSpVariable; + Dyn<SPU_Variable> pSpuVariable; S_ParamInfo aResultParamInfo; }; diff --git a/autodoc/source/parser/cpp/pe_tpltp.cxx b/autodoc/source/parser/cpp/pe_tpltp.cxx index 1cbb5b47c851..9c6986f06104 100644 --- a/autodoc/source/parser/cpp/pe_tpltp.cxx +++ b/autodoc/source/parser/cpp/pe_tpltp.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 @@ -62,9 +62,9 @@ PE_TemplateTop::Call_Handler( const cpp::Token & i_rTok ) void PE_TemplateTop::Setup_StatusFunctions() { - typedef CallFunction<PE_TemplateTop>::F_Tok F_Tok; + typedef CallFunction<PE_TemplateTop>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_TemplateTop::On_start_Less }; + static F_Tok stateF_start[] = { &PE_TemplateTop::On_start_Less }; static INT16 stateT_start[] = { Tid_Less }; static F_Tok stateF_expect_qualifier[]= { &PE_TemplateTop::On_expect_qualifier_ClassOrTypename, @@ -74,10 +74,10 @@ PE_TemplateTop::Setup_StatusFunctions() Tid_Greater, Tid_typename }; - static F_Tok stateF_expect_name[] = { &PE_TemplateTop::On_expect_name_Identifier }; + static F_Tok stateF_expect_name[] = { &PE_TemplateTop::On_expect_name_Identifier }; static INT16 stateT_expect_name[] = { Tid_Identifier }; - static F_Tok stateF_expect_separator[]= { &PE_TemplateTop::On_expect_separator_Comma, + static F_Tok stateF_expect_separator[]= { &PE_TemplateTop::On_expect_separator_Comma, &PE_TemplateTop::On_expect_separator_Greater }; static INT16 stateT_expect_separator[]= { Tid_Comma, Tid_Greater }; diff --git a/autodoc/source/parser/cpp/pe_tpltp.hxx b/autodoc/source/parser/cpp/pe_tpltp.hxx index 9d1fdbff8911..99c6545bd420 100644 --- a/autodoc/source/parser/cpp/pe_tpltp.hxx +++ b/autodoc/source/parser/cpp/pe_tpltp.hxx @@ -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 @@ -56,31 +56,31 @@ class PE_TemplateTop : public cpp::Cpp_PE size_of_states }; PE_TemplateTop( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_TemplateTop(); const StringVector & Result_Parameters() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError(const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError(const char *); - void On_start_Less(const char *); + void On_start_Less(const char *); - void On_expect_qualifier_ClassOrTypename(const char *); - void On_expect_qualifier_Greater(const char *); - void On_expect_qualifier_Other(const char *); + void On_expect_qualifier_ClassOrTypename(const char *); + void On_expect_qualifier_Greater(const char *); + void On_expect_qualifier_Other(const char *); - void On_expect_name_Identifier(const char *); + void On_expect_name_Identifier(const char *); - void On_expect_separator_Comma(const char *); - void On_expect_separator_Greater(const char *); + void On_expect_separator_Comma(const char *); + void On_expect_separator_Greater(const char *); // DATA Dyn< PeStatusArray<PE_TemplateTop> > diff --git a/autodoc/source/parser/cpp/pe_tydef.cxx b/autodoc/source/parser/cpp/pe_tydef.cxx index fa5527fefbc4..01c498168ecf 100644 --- a/autodoc/source/parser/cpp/pe_tydef.cxx +++ b/autodoc/source/parser/cpp/pe_tydef.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 @@ -68,14 +68,14 @@ PE_Typedef::Call_Handler( const cpp::Token & i_rTok ) void PE_Typedef::Setup_StatusFunctions() { - typedef CallFunction<PE_Typedef>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_Typedef::On_start_typedef }; - static INT16 stateT_start[] = { Tid_typedef }; + typedef CallFunction<PE_Typedef>::F_Tok F_Tok; + static F_Tok stateF_start[] = { &PE_Typedef::On_start_typedef }; + static INT16 stateT_start[] = { Tid_typedef }; - static F_Tok stateF_expectName[] = { &PE_Typedef::On_expectName_Identifier }; + static F_Tok stateF_expectName[] = { &PE_Typedef::On_expectName_Identifier }; static INT16 stateT_expectName[] = { Tid_Identifier }; - static F_Tok stateF_afterName[] = { &PE_Typedef::On_afterName_Semicolon }; + static F_Tok stateF_afterName[] = { &PE_Typedef::On_afterName_Semicolon }; static INT16 stateT_afterName[] = { Tid_Semicolon }; SEMPARSE_CREATE_STATUS(PE_Typedef, start, Hdl_SyntaxError); diff --git a/autodoc/source/parser/cpp/pe_tydef.hxx b/autodoc/source/parser/cpp/pe_tydef.hxx index 5c4cac474814..12b4749bf1d3 100644 --- a/autodoc/source/parser/cpp/pe_tydef.hxx +++ b/autodoc/source/parser/cpp/pe_tydef.hxx @@ -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 @@ -54,34 +54,34 @@ class PE_Typedef : public cpp::Cpp_PE size_of_states }; PE_Typedef( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Typedef(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_Typedef, PE_Type > SP_Type; - typedef SubPeUse< PE_Typedef, PE_Type> SPU_Type; + typedef SubPe< PE_Typedef, PE_Type > SP_Type; + typedef SubPeUse< PE_Typedef, PE_Type> SPU_Type; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); - void SpReturn_Type(); + void SpReturn_Type(); - void On_start_typedef( const char * ); - void On_expectName_Identifier( const char * ); - void On_afterName_Semicolon( const char * ); + void On_start_typedef( const char * ); + void On_expectName_Identifier( const char * ); + void On_afterName_Semicolon( const char * ); // DATA Dyn< PeStatusArray<PE_Typedef> > pStati; - Dyn<SP_Type> pSpType; - Dyn<SPU_Type> pSpuType; + Dyn<SP_Type> pSpType; + Dyn<SPU_Type> pSpuType; String sName; - ary::cpp::Type_id nType; + ary::cpp::Type_id nType; }; diff --git a/autodoc/source/parser/cpp/pe_type.cxx b/autodoc/source/parser/cpp/pe_type.cxx index 1f34ddffc14e..69f848598dd6 100644 --- a/autodoc/source/parser/cpp/pe_type.cxx +++ b/autodoc/source/parser/cpp/pe_type.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 @@ -77,10 +77,10 @@ NullType::inq_IsConst() const } void -NullType::inq_Get_Text( StreamStr & , +NullType::inq_Get_Text( StreamStr & , StreamStr & , StreamStr & , - const ary::cpp::Gate & ) const + const ary::cpp::Gate & ) const { // Does nothing. } @@ -121,11 +121,11 @@ PE_Type::PE_Type( Cpp_PE * i_pParent ) pSpEnum = new SP_Enum(*this); pSpuType_TemplateParameter - = new SPU_Type( *pSpType, 0, + = new SPU_Type( *pSpType, 0, &PE_Type::SpReturn_Type_TemplateParameter ); - pSpuClass = new SPU_Class( *pSpClass, 0, + pSpuClass = new SPU_Class( *pSpClass, 0, & PE_Type::SpReturn_Class ); - pSpuEnum = new SPU_Enum( *pSpEnum, 0, + pSpuEnum = new SPU_Enum( *pSpEnum, 0, & PE_Type::SpReturn_Enum ); } @@ -148,8 +148,8 @@ PE_Type::Call_Handler( const cpp::Token & i_rTok ) void PE_Type::Setup_StatusFunctions() { - typedef CallFunction<PE_Type>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_Type::On_start_Identifier, + typedef CallFunction<PE_Type>::F_Tok F_Tok; + static F_Tok stateF_start[] = { &PE_Type::On_start_Identifier, &PE_Type::On_start_class, &PE_Type::On_start_class, &PE_Type::On_start_class, @@ -161,7 +161,7 @@ PE_Type::Setup_StatusFunctions() &PE_Type::On_start_typename, &PE_Type::On_start_BuiltInType, &PE_Type::On_start_TypeSpecializer }; - static INT16 stateT_start[] = { Tid_Identifier, + static INT16 stateT_start[] = { Tid_Identifier, Tid_class, Tid_struct, Tid_union, @@ -179,7 +179,7 @@ PE_Type::Setup_StatusFunctions() static INT16 stateT_expect_namesegment[] = { Tid_Identifier, Tid_BuiltInType }; - static F_Tok stateF_after_namesegment[] = { &PE_Type::On_after_namesegment_const, + static F_Tok stateF_after_namesegment[] = { &PE_Type::On_after_namesegment_const, &PE_Type::On_after_namesegment_volatile, &PE_Type::On_after_namesegment_Bracket_Left, &PE_Type::On_after_namesegment_DoubleColon, @@ -199,14 +199,14 @@ PE_Type::Setup_StatusFunctions() static INT16 stateT_afterclass_expect_semicolon[] = { Tid_Semicolon }; - static F_Tok stateF_within_template[] = { &PE_Type::On_within_template_Comma, + static F_Tok stateF_within_template[] = { &PE_Type::On_within_template_Comma, &PE_Type::On_within_template_Greater, &PE_Type::On_within_template_Constant }; - static INT16 stateT_within_template[] = { Tid_Comma, + static INT16 stateT_within_template[] = { Tid_Comma, Tid_Greater, Tid_Constant }; - static F_Tok stateF_within_indirection[] = { &PE_Type::On_within_indirection_const, + static F_Tok stateF_within_indirection[] = { &PE_Type::On_within_indirection_const, &PE_Type::On_within_indirection_volatile, &PE_Type::On_within_indirection_Asterix, &PE_Type::On_within_indirection_AmpersAnd }; diff --git a/autodoc/source/parser/cpp/pe_type.hxx b/autodoc/source/parser/cpp/pe_type.hxx index 55eeaa5279f4..33afdaa880b0 100644 --- a/autodoc/source/parser/cpp/pe_type.hxx +++ b/autodoc/source/parser/cpp/pe_type.hxx @@ -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 @@ -74,92 +74,92 @@ class PE_Type : public Cpp_PE }; PE_Type( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Type(); void Init_AsCastOperatorType(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); - E_KindOfResult Result_KindOf() const; + E_KindOfResult Result_KindOf() const; const ary::cpp::Type & Result_Type() const; private: - typedef SubPe< PE_Type, PE_Type > SP_Type; - typedef SubPe< PE_Type, PE_Class > SP_Class; - typedef SubPe< PE_Type, PE_Enum > SP_Enum; - typedef SubPeUse< PE_Type, PE_Type > SPU_Type; - typedef SubPeUse< PE_Type, PE_Class > SPU_Class; - typedef SubPeUse< PE_Type, PE_Enum > SPU_Enum; - - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError( const char *); - - void SpReturn_Type_TemplateParameter(); - void SpReturn_Class(); - void SpReturn_Enum(); - - void On_EndOfType(const char *); - - void On_start_Identifier(const char *); - void On_start_class(const char *); - void On_start_enum(const char *); - void On_start_const(const char *); - void On_start_volatile(const char *); - void On_start_Bracket_Right(const char *); - void On_start_DoubleColon(const char *); - void On_start_BuiltInType(const char *); - void On_start_TypeSpecializer(const char *); - void On_start_typename(const char *); - - void On_expect_namesegment_Identifier(const char *); - - void On_after_namesegment_const(const char *); - void On_after_namesegment_volatile(const char *); + typedef SubPe< PE_Type, PE_Type > SP_Type; + typedef SubPe< PE_Type, PE_Class > SP_Class; + typedef SubPe< PE_Type, PE_Enum > SP_Enum; + typedef SubPeUse< PE_Type, PE_Type > SPU_Type; + typedef SubPeUse< PE_Type, PE_Class > SPU_Class; + typedef SubPeUse< PE_Type, PE_Enum > SPU_Enum; + + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError( const char *); + + void SpReturn_Type_TemplateParameter(); + void SpReturn_Class(); + void SpReturn_Enum(); + + void On_EndOfType(const char *); + + void On_start_Identifier(const char *); + void On_start_class(const char *); + void On_start_enum(const char *); + void On_start_const(const char *); + void On_start_volatile(const char *); + void On_start_Bracket_Right(const char *); + void On_start_DoubleColon(const char *); + void On_start_BuiltInType(const char *); + void On_start_TypeSpecializer(const char *); + void On_start_typename(const char *); + + void On_expect_namesegment_Identifier(const char *); + + void On_after_namesegment_const(const char *); + void On_after_namesegment_volatile(const char *); void On_after_namesegment_Bracket_Left(const char *); - void On_after_namesegment_DoubleColon(const char *); - void On_after_namesegment_Less(const char *); - void On_after_namesegment_Asterix(const char *); - void On_after_namesegment_AmpersAnd(const char *); + void On_after_namesegment_DoubleColon(const char *); + void On_after_namesegment_Less(const char *); + void On_after_namesegment_Asterix(const char *); + void On_after_namesegment_AmpersAnd(const char *); - void On_afterclass_expect_semicolon_Semicolon(const char *); + void On_afterclass_expect_semicolon_Semicolon(const char *); - void On_within_template_Comma(const char *); - void On_within_template_Greater(const char *); - void On_within_template_Constant(const char *); - void On_within_template_TypeStart(const char *); + void On_within_template_Comma(const char *); + void On_within_template_Greater(const char *); + void On_within_template_Constant(const char *); + void On_within_template_TypeStart(const char *); - void On_within_indirection_const(const char *); - void On_within_indirection_volatile(const char *); - void On_within_indirection_Asterix(const char *); - void On_within_indirection_AmpersAnd(const char *); + void On_within_indirection_const(const char *); + void On_within_indirection_volatile(const char *); + void On_within_indirection_Asterix(const char *); + void On_within_indirection_AmpersAnd(const char *); - bool IsType() const; + bool IsType() const; // DATA Dyn< PeStatusArray<PE_Type> > pStati; - Dyn<SP_Type> pSpType; - Dyn<SPU_Type> pSpuType_TemplateParameter; - Dyn<SP_Class> pSpClass; - Dyn<SPU_Class> pSpuClass; - Dyn<SP_Enum> pSpEnum; - Dyn<SPU_Enum> pSpuEnum; + Dyn<SP_Type> pSpType; + Dyn<SPU_Type> pSpuType_TemplateParameter; + Dyn<SP_Class> pSpClass; + Dyn<SPU_Class> pSpuClass; + Dyn<SP_Enum> pSpEnum; + Dyn<SPU_Enum> pSpuEnum; Dyn<ary::cpp::UsedType> pType; ary::cpp::ut::List_TplParameter * pCurTemplate_ParameterList; String sOwningClassName; - String sParsedClass_Name; + String sParsedClass_Name; const ary::cpp::Type * pResult_Type; - E_KindOfResult eResult_KindOf; + E_KindOfResult eResult_KindOf; bool bIsCastOperatorType; }; diff --git a/autodoc/source/parser/cpp/pe_vafu.cxx b/autodoc/source/parser/cpp/pe_vafu.cxx index ca9a538f544e..be771157b81c 100644 --- a/autodoc/source/parser/cpp/pe_vafu.cxx +++ b/autodoc/source/parser/cpp/pe_vafu.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 @@ -51,7 +51,7 @@ namespace cpp { -//*********************** PE_VarFunc ***********************// +//*********************** PE_VarFunc ***********************// PE_VarFunc::PE_VarFunc( Cpp_PE * i_pParent ) @@ -114,9 +114,9 @@ PE_VarFunc::Call_Handler( const cpp::Token & i_rTok ) void PE_VarFunc::Setup_StatusFunctions() { - typedef CallFunction<PE_VarFunc>::F_Tok F_Tok; + typedef CallFunction<PE_VarFunc>::F_Tok F_Tok; - static F_Tok stateF_start[] = { &PE_VarFunc::On_start_Identifier, + static F_Tok stateF_start[] = { &PE_VarFunc::On_start_Identifier, &PE_VarFunc::On_start_operator, &PE_VarFunc::On_start_TypeKey, &PE_VarFunc::On_start_TypeKey, @@ -137,7 +137,7 @@ PE_VarFunc::Setup_StatusFunctions() &PE_VarFunc::On_start_typename, &PE_VarFunc::On_start_Identifier, &PE_VarFunc::On_start_Identifier }; - static INT16 stateT_start[] = { Tid_Identifier, + static INT16 stateT_start[] = { Tid_Identifier, Tid_operator, Tid_class, Tid_struct, @@ -159,27 +159,27 @@ PE_VarFunc::Setup_StatusFunctions() Tid_BuiltInType, Tid_TypeSpecializer }; - static F_Tok stateF_expectCtor[] = { &PE_VarFunc::On_expectCtor_Bracket_Left }; - static INT16 stateT_expectCtor[] = { Tid_Bracket_Left }; + static F_Tok stateF_expectCtor[] = { &PE_VarFunc::On_expectCtor_Bracket_Left }; + static INT16 stateT_expectCtor[] = { Tid_Bracket_Left }; - static F_Tok stateF_afterClassDecl[] = { &PE_VarFunc::On_afterClassDecl_Semicolon }; + static F_Tok stateF_afterClassDecl[] = { &PE_VarFunc::On_afterClassDecl_Semicolon }; static INT16 stateT_afterClassDecl[] = { Tid_Semicolon }; - static F_Tok stateF_expectName[] = { &PE_VarFunc::On_expectName_Identifier, + static F_Tok stateF_expectName[] = { &PE_VarFunc::On_expectName_Identifier, &PE_VarFunc::On_expectName_operator, &PE_VarFunc::On_expectName_Bracket_Left }; - static INT16 stateT_expectName[] = { Tid_Identifier, + static INT16 stateT_expectName[] = { Tid_Identifier, Tid_operator, Tid_Bracket_Left }; - static F_Tok stateF_afterName[] = { &PE_VarFunc::On_afterName_ArrayBracket_Left, + static F_Tok stateF_afterName[] = { &PE_VarFunc::On_afterName_ArrayBracket_Left, &PE_VarFunc::On_afterName_Bracket_Left, &PE_VarFunc::On_afterName_DoubleColon, &PE_VarFunc::On_afterName_Semicolon, &PE_VarFunc::On_afterName_Comma, &PE_VarFunc::On_afterName_Assign, &PE_VarFunc::On_afterName_Less }; - static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, + static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, Tid_Bracket_Left, Tid_DoubleColon, Tid_Semicolon, @@ -194,9 +194,9 @@ PE_VarFunc::Setup_StatusFunctions() { Tid_Less, Tid_Greater }; - static F_Tok stateF_finished[] = { &PE_VarFunc::On_finished_Semicolon, + static F_Tok stateF_finished[] = { &PE_VarFunc::On_finished_Semicolon, &PE_VarFunc::On_finished_Comma }; - static INT16 stateT_finished[] = { Tid_Semicolon, + static INT16 stateT_finished[] = { Tid_Semicolon, Tid_Comma }; static F_Tok stateF_finishedIncludingFunctionImplementation[] = @@ -345,7 +345,7 @@ PE_VarFunc::SpReturn_Variable() // ary::S_InitData aData( 0, Env().CurCeSpace().Id(), i_sName, 0 ); ary::cpp::Variable & rCurParsedVariable - = Env().AryGate().Ces().Store_Variable( Env().Context(), + = Env().AryGate().Ces().Store_Variable( Env().Context(), sName, nResultFrontType, aFlags, diff --git a/autodoc/source/parser/cpp/pe_vafu.hxx b/autodoc/source/parser/cpp/pe_vafu.hxx index c31bbb5daf47..1f3f4ff1d13c 100644 --- a/autodoc/source/parser/cpp/pe_vafu.hxx +++ b/autodoc/source/parser/cpp/pe_vafu.hxx @@ -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 @@ -69,92 +69,92 @@ class PE_VarFunc : public Cpp_PE enum E_ResultType { result_unknown = 0, - result_ignore, /// Used for class and enum declarations and predeclarations and for extern variables and functions. + result_ignore, /// Used for class and enum declarations and predeclarations and for extern variables and functions. result_variable, result_function }; - typedef ary::cpp::E_Protection E_Protection; + typedef ary::cpp::E_Protection E_Protection; PE_VarFunc( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_VarFunc(); - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); const std::vector<ary::cpp::Ce_id> & Result_Ids() const; ary::cpp::Type_id Result_FrontType() const; const StringVector & Result_Names() const; - E_ResultType Result_CeType() const; + E_ResultType Result_CeType() const; private: - typedef SubPe< PE_VarFunc, PE_Type > SP_Type; - typedef SubPeUse< PE_VarFunc, PE_Type > SPU_Type; - typedef SubPe< PE_VarFunc, PE_Variable > SP_Variable; - typedef SubPeUse< PE_VarFunc, PE_Variable > SPU_Variable; - typedef SubPe< PE_VarFunc, PE_Function > SP_Function; - typedef SubPeUse< PE_VarFunc, PE_Function > SPU_Function; - typedef SubPe< PE_VarFunc, PE_Ignore > SP_Ignore; + typedef SubPe< PE_VarFunc, PE_Type > SP_Type; + typedef SubPeUse< PE_VarFunc, PE_Type > SPU_Type; + typedef SubPe< PE_VarFunc, PE_Variable > SP_Variable; + typedef SubPeUse< PE_VarFunc, PE_Variable > SPU_Variable; + typedef SubPe< PE_VarFunc, PE_Function > SP_Function; + typedef SubPeUse< PE_VarFunc, PE_Function > SPU_Function; + typedef SubPe< PE_VarFunc, PE_Ignore > SP_Ignore; typedef SubPeUse< PE_VarFunc, PE_Ignore > SPU_Ignore; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_UnknownToken( const char *); - - void SpInit_FunctionStd(); - void SpInit_FunctionCtor(); - void SpInit_FunctionDtor(); - void SpInit_FunctionCastOperator(); - void SpInit_FunctionNormalOperator(); - void SpReturn_Type(); - void SpReturn_Variable(); - void SpReturn_FunctionStd(); - void SpReturn_Ignore(); - - void On_start_Identifier(const char * i_sText); - void On_start_operator(const char * i_sText); - void On_start_TypeKey(const char * i_sText); - void On_start_virtual(const char * i_sText); - void On_start_Tilde(const char * i_sText); - void On_start_const(const char * i_sText); - void On_start_volatile(const char * i_sText); - void On_start_extern(const char * i_sText); - void On_start_static(const char * i_sText); - void On_start_mutable(const char * i_sText); - void On_start_register(const char * i_sText); - void On_start_inline(const char * i_sText); - void On_start_explicit(const char * i_sText); - void On_start_Bracket_Right(const char * i_sText); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_UnknownToken( const char *); + + void SpInit_FunctionStd(); + void SpInit_FunctionCtor(); + void SpInit_FunctionDtor(); + void SpInit_FunctionCastOperator(); + void SpInit_FunctionNormalOperator(); + void SpReturn_Type(); + void SpReturn_Variable(); + void SpReturn_FunctionStd(); + void SpReturn_Ignore(); + + void On_start_Identifier(const char * i_sText); + void On_start_operator(const char * i_sText); + void On_start_TypeKey(const char * i_sText); + void On_start_virtual(const char * i_sText); + void On_start_Tilde(const char * i_sText); + void On_start_const(const char * i_sText); + void On_start_volatile(const char * i_sText); + void On_start_extern(const char * i_sText); + void On_start_static(const char * i_sText); + void On_start_mutable(const char * i_sText); + void On_start_register(const char * i_sText); + void On_start_inline(const char * i_sText); + void On_start_explicit(const char * i_sText); + void On_start_Bracket_Right(const char * i_sText); void On_start_typename(const char * i_sText); - void On_expectCtor_Bracket_Left(const char * i_sText); + void On_expectCtor_Bracket_Left(const char * i_sText); - void On_afterClassDecl_Semicolon(const char * i_sText); + void On_afterClassDecl_Semicolon(const char * i_sText); - void On_expectName_Identifier(const char * i_sText); - void On_expectName_operator(const char * i_sText); - void On_expectName_Bracket_Left(const char * i_sText); + void On_expectName_Identifier(const char * i_sText); + void On_expectName_operator(const char * i_sText); + void On_expectName_Bracket_Left(const char * i_sText); - void On_afterName_ArrayBracket_Left(const char * i_sText); - void On_afterName_Bracket_Left(const char * i_sText); + void On_afterName_ArrayBracket_Left(const char * i_sText); + void On_afterName_Bracket_Left(const char * i_sText); void On_afterName_DoubleColon(const char * i_sText); - void On_afterName_Semicolon(const char * i_sText); - void On_afterName_Comma(const char * i_sText); - void On_afterName_Assign(const char * i_sText); - void On_afterName_Less(const char * i_sText); + void On_afterName_Semicolon(const char * i_sText); + void On_afterName_Comma(const char * i_sText); + void On_afterName_Assign(const char * i_sText); + void On_afterName_Less(const char * i_sText); void On_afterName_inErraneousTemplate_Less(const char * i_sText); void On_afterName_inErraneousTemplate_Greater(const char * i_sText); void On_afterName_inErraneousTemplate_Default(const char * i_sText); - void On_finished_Semicolon(const char * i_sText); - void On_finished_Comma(const char * i_sText); - void On_finished_Default(const char * i_sText); + void On_finished_Semicolon(const char * i_sText); + void On_finished_Comma(const char * i_sText); + void On_finished_Default(const char * i_sText); void On_finishedIncludingFunctionImplementation_Default(const char * i_sText); @@ -165,25 +165,25 @@ class PE_VarFunc : public Cpp_PE Dyn< PeStatusArray<PE_VarFunc> > pStati; - Dyn<SP_Type> pSpType; - Dyn<SPU_Type> pSpuType; - Dyn<SP_Variable> pSpVariable; - Dyn<SPU_Variable> pSpuVariable; - Dyn<SP_Function> pSpFunction; - Dyn<SPU_Function> pSpuFunctionStd; - Dyn<SPU_Function> pSpuFunctionCtor; - Dyn<SPU_Function> pSpuFunctionDtor; - Dyn<SPU_Function> pSpuFunctionCastOperator; - Dyn<SPU_Function> pSpuFunctionNormalOperator; - Dyn<SP_Ignore> pSpIgnore; - Dyn<SPU_Ignore> pSpuIgnore; + Dyn<SP_Type> pSpType; + Dyn<SPU_Type> pSpuType; + Dyn<SP_Variable> pSpVariable; + Dyn<SPU_Variable> pSpuVariable; + Dyn<SP_Function> pSpFunction; + Dyn<SPU_Function> pSpuFunctionStd; + Dyn<SPU_Function> pSpuFunctionCtor; + Dyn<SPU_Function> pSpuFunctionDtor; + Dyn<SPU_Function> pSpuFunctionCastOperator; + Dyn<SPU_Function> pSpuFunctionNormalOperator; + Dyn<SP_Ignore> pSpIgnore; + Dyn<SPU_Ignore> pSpuIgnore; intt nCounter_TemplateBrackets; bool bInDestructor; std::vector<ary::cpp::Ce_id> aResultIds; - ary::cpp::Type_id nResultFrontType; + ary::cpp::Type_id nResultFrontType; E_ResultType eResultType; // Pre-Results @@ -223,12 +223,12 @@ PE_VarFunc::Result_CeType() const #endif -/* // Overview of Stati +/* // Overview of Stati Undecided --------- -start // vor und während storage class specifiern +start // vor und während storage class specifiern any ->stay operaator ->goto Function @@ -246,14 +246,14 @@ afterName ->goto Variable or Function Variable -------- -start // vor und während storage class specifiern +start // vor und während storage class specifiern ->Typ -expectName // Typ ist da -> im Falle von '(': notyetimplemented +expectName // Typ ist da -> im Falle von '(': notyetimplemented afterName -expectSize // after [ +expectSize // after [ expectFinish // vor ; oder , expectNextVarName // anders als bei expectName kann hier auch * oder & kommen @@ -265,18 +265,18 @@ expectNextVarName // anders als bei expectName kann hier auch * oder & kommen Function -------- -start // vor und während storage class specifiern +start // vor und während storage class specifiern ->Typ -expectName // Typ ist da -expectBracket // Nach Name -expectParameter // nach ( oder , +expectName // Typ ist da +expectBracket // Nach Name +expectParameter // nach ( oder , -> Parameter after Parameters // before const, volatile throw or = 0. -after throw // expect ( -expectException // after ( -after exceptions // = 0 oder ; oder , +after throw // expect ( +expectException // after ( +after exceptions // = 0 oder ; oder , expectNextVarName // anders als bei expectName kann hier auch * oder & kommen diff --git a/autodoc/source/parser/cpp/pe_vari.cxx b/autodoc/source/parser/cpp/pe_vari.cxx index f062c5a1901f..257537210fdd 100644 --- a/autodoc/source/parser/cpp/pe_vari.cxx +++ b/autodoc/source/parser/cpp/pe_vari.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 @@ -62,7 +62,7 @@ PE_Variable::~PE_Variable() } void -PE_Variable::Call_Handler( const cpp::Token & i_rTok ) +PE_Variable::Call_Handler( const cpp::Token & i_rTok ) { pStati->Cur().Call_Handler(i_rTok.TypeId(), i_rTok.Text()); } @@ -70,22 +70,22 @@ PE_Variable::Call_Handler( const cpp::Token & i_rTok ) void PE_Variable::Setup_StatusFunctions() { - typedef CallFunction<PE_Variable>::F_Tok F_Tok; + typedef CallFunction<PE_Variable>::F_Tok F_Tok; - static F_Tok stateF_afterName[] = { &PE_Variable::On_afterName_ArrayBracket_Left, + static F_Tok stateF_afterName[] = { &PE_Variable::On_afterName_ArrayBracket_Left, &PE_Variable::On_afterName_Semicolon, &PE_Variable::On_afterName_Comma, &PE_Variable::On_afterName_Assign }; - static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, + static INT16 stateT_afterName[] = { Tid_ArrayBracket_Left, Tid_Semicolon, Tid_Comma, Tid_Assign }; - static F_Tok stateF_afterSize[] = { &PE_Variable::On_afterSize_ArrayBracket_Right }; - static INT16 stateT_afterSize[] = { Tid_ArrayBracket_Right }; - static F_Tok stateF_expectFinish[] = { &PE_Variable::On_expectFinish_Bracket_Right, + static F_Tok stateF_afterSize[] = { &PE_Variable::On_afterSize_ArrayBracket_Right }; + static INT16 stateT_afterSize[] = { Tid_ArrayBracket_Right }; + static F_Tok stateF_expectFinish[] = { &PE_Variable::On_expectFinish_Bracket_Right, &PE_Variable::On_expectFinish_Semicolon, &PE_Variable::On_expectFinish_Comma }; - static INT16 stateT_expectFinish[] = { Tid_Bracket_Right, + static INT16 stateT_expectFinish[] = { Tid_Bracket_Right, Tid_Semicolon, Tid_Comma }; diff --git a/autodoc/source/parser/cpp/pe_vari.hxx b/autodoc/source/parser/cpp/pe_vari.hxx index 58370616359a..8f3ce687bbcb 100644 --- a/autodoc/source/parser/cpp/pe_vari.hxx +++ b/autodoc/source/parser/cpp/pe_vari.hxx @@ -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 @@ -54,11 +54,11 @@ class PE_Variable : public Cpp_PE { afterName, // afterSize, // after ] - expectFinish, // after InitExpression + expectFinish, // after InitExpression size_of_states }; PE_Variable( - Cpp_PE * i_pParent ); + Cpp_PE * i_pParent ); ~PE_Variable(); /** @return @@ -67,33 +67,33 @@ class PE_Variable : public Cpp_PE */ UINT16 Result_Pattern() const; const String & Result_SizeExpression() const; - const String & Result_InitExpression() const; + const String & Result_InitExpression() const; - virtual void Call_Handler( - const cpp::Token & i_rTok ); + virtual void Call_Handler( + const cpp::Token & i_rTok ); private: - typedef SubPe< PE_Variable, PE_Expression > SP_Expression; - typedef SubPeUse< PE_Variable, PE_Expression> SPU_Expression; + typedef SubPe< PE_Variable, PE_Expression > SP_Expression; + typedef SubPeUse< PE_Variable, PE_Expression> SPU_Expression; - void Setup_StatusFunctions(); - virtual void InitData(); - virtual void TransferData(); - void Hdl_SyntaxError(const char *); + void Setup_StatusFunctions(); + virtual void InitData(); + virtual void TransferData(); + void Hdl_SyntaxError(const char *); void SpReturn_ArraySizeExpression(); void SpReturn_InitExpression(); - void On_afterName_ArrayBracket_Left(const char * i_sText); - void On_afterName_Semicolon(const char * i_sText); - void On_afterName_Comma(const char * i_sText); - void On_afterName_Assign(const char * i_sText); + void On_afterName_ArrayBracket_Left(const char * i_sText); + void On_afterName_Semicolon(const char * i_sText); + void On_afterName_Comma(const char * i_sText); + void On_afterName_Assign(const char * i_sText); - void On_afterSize_ArrayBracket_Right(const char * i_sText); + void On_afterSize_ArrayBracket_Right(const char * i_sText); - void On_expectFinish_Semicolon(const char * i_sText); - void On_expectFinish_Comma(const char * i_sText); - void On_expectFinish_Bracket_Right(const char * i_sText); + void On_expectFinish_Semicolon(const char * i_sText); + void On_expectFinish_Comma(const char * i_sText); + void On_expectFinish_Bracket_Right(const char * i_sText); // DATA Dyn< PeStatusArray<PE_Variable> > diff --git a/autodoc/source/parser/cpp/pev.hxx b/autodoc/source/parser/cpp/pev.hxx index 31a873ef7f0f..eb10ecbdfd78 100644 --- a/autodoc/source/parser/cpp/pev.hxx +++ b/autodoc/source/parser/cpp/pev.hxx @@ -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 @@ -68,25 +68,25 @@ class PeEnvironment : protected TokenProcessing_Types { public: // INQUIRY - virtual ~PeEnvironment() {} + virtual ~PeEnvironment() {} // OPERATIONS // Token results - void SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push = 0 ); + void SetTokenResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push = 0 ); // Owner stack void OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace ); void OpenExternC( - bool i_bOnlyForOneDeclaration = false ); + bool i_bOnlyForOneDeclaration = false ); void OpenClass( - ary::cpp::Class & io_rOpenedClass ); + ary::cpp::Class & io_rOpenedClass ); void OpenEnum( - ary::cpp::Enum & io_rOpenedEnum ); + ary::cpp::Enum & io_rOpenedEnum ); void CloseBlock(); /// Handles a '}' on file scope. void CloseClass(); void CloseEnum(); @@ -141,18 +141,18 @@ class PeEnvironment : protected TokenProcessing_Types private: virtual void do_SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ) = 0; + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ) = 0; virtual void do_OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace ) = 0; virtual void do_OpenExternC( - bool i_bOnlyForOneDeclaration ) = 0; + bool i_bOnlyForOneDeclaration ) = 0; virtual void do_OpenClass( - ary::cpp::Class & io_rOpenedClass ) = 0; + ary::cpp::Class & io_rOpenedClass ) = 0; virtual void do_OpenEnum( - ary::cpp::Enum & io_rOpenedEnum ) = 0; + ary::cpp::Enum & io_rOpenedEnum ) = 0; virtual void do_CloseBlock() = 0; virtual void do_CloseClass() = 0; virtual void do_CloseEnum() = 0; @@ -193,7 +193,7 @@ class PeEnvironment : protected TokenProcessing_Types inq_AryGate() const = 0; virtual const ary::cpp::InputContext & inq_Context() const = 0; - virtual String inq_CurFileName() const = 0; + virtual String inq_CurFileName() const = 0; virtual uintt inq_LineCount() const = 0; virtual bool inq_IsWaitingFor_Recovery() const = 0; virtual bool inq_IsExternC() const = 0; @@ -204,9 +204,9 @@ class PeEnvironment : protected TokenProcessing_Types // IMPLEMENTATION inline void -PeEnvironment::SetTokenResult( E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - ParseEnvironment * i_pParseEnv2Push ) +PeEnvironment::SetTokenResult( E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + ParseEnvironment * i_pParseEnv2Push ) { do_SetTokenResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); } inline void PeEnvironment::OpenNamespace( ary::cpp::Namespace & io_rOpenedNamespace ) @@ -215,7 +215,7 @@ inline void PeEnvironment::OpenExternC( bool i_bOnlyForOneDeclaration ) { do_OpenExternC(i_bOnlyForOneDeclaration); } inline void -PeEnvironment::OpenClass( ary::cpp::Class & io_rOpenedClass ) +PeEnvironment::OpenClass( ary::cpp::Class & io_rOpenedClass ) { do_OpenClass(io_rOpenedClass); } inline void PeEnvironment::OpenEnum( ary::cpp::Enum & io_rOpenedEnum ) @@ -283,7 +283,7 @@ PeEnvironment::AryGate() const inline const ary::cpp::InputContext & PeEnvironment::Context() const { return inq_Context(); } -inline String +inline String PeEnvironment::CurFileName() const { return inq_CurFileName(); } inline uintt diff --git a/autodoc/source/parser/cpp/preproc.cxx b/autodoc/source/parser/cpp/preproc.cxx index 856736b96442..5955f0378563 100644 --- a/autodoc/source/parser/cpp/preproc.cxx +++ b/autodoc/source/parser/cpp/preproc.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 diff --git a/autodoc/source/parser/cpp/preproc.hxx b/autodoc/source/parser/cpp/preproc.hxx index 0f78e5affb1f..dc4e99349229 100644 --- a/autodoc/source/parser/cpp/preproc.hxx +++ b/autodoc/source/parser/cpp/preproc.hxx @@ -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 diff --git a/autodoc/source/parser/cpp/prs_cpp.cxx b/autodoc/source/parser/cpp/prs_cpp.cxx index 6cda9eab509a..f4781e67d97f 100644 --- a/autodoc/source/parser/cpp/prs_cpp.cxx +++ b/autodoc/source/parser/cpp/prs_cpp.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 @@ -74,11 +74,11 @@ class Udk_MacroMap struct S_RunningData { - CharacterSource aFileContent; + CharacterSource aFileContent; ary::cpp::Gate & rCppGate; Udk_MacroMap aMacros; - Distributor aDealer; - TokenParser_Cpp aTkp; + Distributor aDealer; + TokenParser_Cpp aTkp; S_RunningData( ary::Repository & o_rRepository, diff --git a/autodoc/source/parser/cpp/sdocdist.hxx b/autodoc/source/parser/cpp/sdocdist.hxx index 10e6fd4dced8..e7fe91982d58 100644 --- a/autodoc/source/parser/cpp/sdocdist.hxx +++ b/autodoc/source/parser/cpp/sdocdist.hxx @@ -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 @@ -61,18 +61,18 @@ struct ContextForAry::S_DocuDistributor : public ary::info::DocuStore private: // Interface ary::info::DocuStore - virtual void do_Store2CurFile( + virtual void do_Store2CurFile( DYN ary::doc::Node& let_drDocu ); - virtual void do_Store2CurNamespace( + virtual void do_Store2CurNamespace( DYN ary::doc::Node& let_drDocu ); - virtual void do_Store2ConnectedDeclaration( + virtual void do_Store2ConnectedDeclaration( DYN ary::doc::Node& let_drDocu ); - virtual void do_Store2Glossary( + virtual void do_Store2Glossary( DYN ary::doc::Node& let_drDocu, - const String & i_sExplainedTerm ); - virtual void do_Store2GlobalTexts( + const String & i_sExplainedTerm ); + virtual void do_Store2GlobalTexts( DYN ary::doc::Node& let_drDocu, ary::info::GlobalTextId i_nId ); @@ -135,7 +135,7 @@ S_DocuDistributor::do_Store2ConnectedDeclaration( DYN ary::doc::Node & let_drDoc void ContextForAry:: S_DocuDistributor::do_Store2Glossary( DYN ary::doc::Node & let_drDocu, - const String & // i_sExplainedTerm + const String & // i_sExplainedTerm ) { // KORR_FUTURE diff --git a/autodoc/source/parser/cpp/sfscope.hxx b/autodoc/source/parser/cpp/sfscope.hxx index 6f3eaa7b4225..ec27790a8409 100644 --- a/autodoc/source/parser/cpp/sfscope.hxx +++ b/autodoc/source/parser/cpp/sfscope.hxx @@ -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 diff --git a/autodoc/source/parser/cpp/sownstck.hxx b/autodoc/source/parser/cpp/sownstck.hxx index 5c00e40dabf7..8f4a2d7bb5d4 100644 --- a/autodoc/source/parser/cpp/sownstck.hxx +++ b/autodoc/source/parser/cpp/sownstck.hxx @@ -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 @@ -66,9 +66,9 @@ struct ContextForAry::S_OwnerStack io_rOpenedNamespace ); void OpenExternC(); void OpenClass( - ary::cpp::Class & io_rOpenedClass ); + ary::cpp::Class & io_rOpenedClass ); void OpenEnum( - ary::cpp::Enum & io_rOpenedEnum ); + ary::cpp::Enum & io_rOpenedEnum ); void CloseBlock(); void CloseClass(); void CloseEnum(); diff --git a/autodoc/source/parser/cpp/srecover.hxx b/autodoc/source/parser/cpp/srecover.hxx index 8408604db3fd..35bc3d7e0645 100644 --- a/autodoc/source/parser/cpp/srecover.hxx +++ b/autodoc/source/parser/cpp/srecover.hxx @@ -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 diff --git a/autodoc/source/parser/cpp/tkp_cpp.cxx b/autodoc/source/parser/cpp/tkp_cpp.cxx index ffe0ca26dfdb..609bdb58d4ee 100644 --- a/autodoc/source/parser/cpp/tkp_cpp.cxx +++ b/autodoc/source/parser/cpp/tkp_cpp.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 @@ -40,7 +40,7 @@ namespace cpp { TokenParser_Cpp::TokenParser_Cpp( DYN autodoc::TkpDocuContext & let_drDocuContext ) - : pBaseContext( new Context_CppStd( let_drDocuContext ) ), + : pBaseContext( new Context_CppStd( let_drDocuContext ) ), pCurContext(0), pDealer(0), pCharacterSource(0) diff --git a/autodoc/source/parser/cpp/tkp_cpp.hxx b/autodoc/source/parser/cpp/tkp_cpp.hxx index 70dfab605c6f..ac84a76b1e79 100644 --- a/autodoc/source/parser/cpp/tkp_cpp.hxx +++ b/autodoc/source/parser/cpp/tkp_cpp.hxx @@ -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 @@ -69,7 +69,7 @@ class TokenParser_Cpp : public TokenParser TokenParser_Cpp( DYN autodoc::TkpDocuContext & let_drDocuContext ); - virtual ~TokenParser_Cpp(); + virtual ~TokenParser_Cpp(); // OPERATIONS void AssignPartners( @@ -79,13 +79,13 @@ class TokenParser_Cpp : public TokenParser const csv::ploc::Path & i_file ); private: - virtual void SetStartContext(); + virtual void SetStartContext(); virtual void SetCurrentContext( - TkpContext & io_rContext ); + TkpContext & io_rContext ); virtual TkpContext & CurrentContext(); // DATA - Dyn<Context_CppStd> pBaseContext; + Dyn<Context_CppStd> pBaseContext; TkpContext * pCurContext; Distributor * pDealer; CharacterSource * pCharacterSource; diff --git a/autodoc/source/parser/cpp/tokintpr.hxx b/autodoc/source/parser/cpp/tokintpr.hxx index f526ba00ee06..2420555d7e54 100644 --- a/autodoc/source/parser/cpp/tokintpr.hxx +++ b/autodoc/source/parser/cpp/tokintpr.hxx @@ -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 @@ -42,13 +42,13 @@ namespace cpp { #define DECL_TOK_HANDLER(token) \ - void Hdl_##token( \ + void Hdl_##token( \ const Tok_##token & i_rTok ) { Call_Handler(i_rTok); } class TokenInterpreter { public: - virtual ~TokenInterpreter() {} + virtual ~TokenInterpreter() {} DECL_TOK_HANDLER(Identifier) DECL_TOK_HANDLER(Operator) @@ -102,8 +102,8 @@ class TokenInterpreter DECL_TOK_HANDLER(Constant) protected: - virtual void Call_Handler( - const cpp::Token & i_rTok ) = 0; + virtual void Call_Handler( + const cpp::Token & i_rTok ) = 0; }; #undef DECL_TOK_HANDLER diff --git a/autodoc/source/parser/inc/adoc/a_rdocu.hxx b/autodoc/source/parser/inc/adoc/a_rdocu.hxx index bf49609f29c4..8a5c56fc7286 100644 --- a/autodoc/source/parser/inc/adoc/a_rdocu.hxx +++ b/autodoc/source/parser/inc/adoc/a_rdocu.hxx @@ -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 @@ -52,14 +52,14 @@ class DocuExplorer public: DocuExplorer(); ~DocuExplorer(); - void StartNewFile( - DocuDealer & o_rDocuDistributor ); + void StartNewFile( + DocuDealer & o_rDocuDistributor ); - void Process_Token( - DYN adoc::Token & let_drToken ); + void Process_Token( + DYN adoc::Token & let_drToken ); private: - DocuDealer * pDocuDistributor; - Dyn<Adoc_PE> pPE; + DocuDealer * pDocuDistributor; + Dyn<Adoc_PE> pPE; bool bIsPassedFirstDocu; }; diff --git a/autodoc/source/parser/inc/adoc/adoc_tok.hxx b/autodoc/source/parser/inc/adoc/adoc_tok.hxx index fa4a143eaf73..c70220395ed3 100644 --- a/autodoc/source/parser/inc/adoc/adoc_tok.hxx +++ b/autodoc/source/parser/inc/adoc/adoc_tok.hxx @@ -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 @@ -46,13 +46,13 @@ class Token : public TextToken { public: // LIFECYCLE - virtual ~Token() {} + virtual ~Token() {} // OPERATIONS - virtual void DealOut( - ::TokenDealer & o_rDealer ); - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const = 0; + virtual void DealOut( + ::TokenDealer & o_rDealer ); + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const = 0; }; diff --git a/autodoc/source/parser/inc/adoc/atokdeal.hxx b/autodoc/source/parser/inc/adoc/atokdeal.hxx index db2765f54e56..7e514698d3cd 100644 --- a/autodoc/source/parser/inc/adoc/atokdeal.hxx +++ b/autodoc/source/parser/inc/adoc/atokdeal.hxx @@ -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 @@ -48,8 +48,8 @@ class TokenDealer : virtual public ::TokenDealer { public: - virtual void Deal_AdcDocu( - adoc::Token & let_drToken ) = 0; + virtual void Deal_AdcDocu( + adoc::Token & let_drToken ) = 0; }; diff --git a/autodoc/source/parser/inc/adoc/cx_a_std.hxx b/autodoc/source/parser/inc/adoc/cx_a_std.hxx index c9a6c1443b12..b7479f5b0473 100644 --- a/autodoc/source/parser/inc/adoc/cx_a_std.hxx +++ b/autodoc/source/parser/inc/adoc/cx_a_std.hxx @@ -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 @@ -53,48 +53,48 @@ class Context_AdocStd : public autodoc::TkpDocuContext, private StateMachineContext { public: - // LIFECYCLE + // LIFECYCLE Context_AdocStd(); - virtual void SetParentContext( - TkpContext & io_rParentContext, - const char * i_sMultiLineEndToken ); + virtual void SetParentContext( + TkpContext & io_rParentContext, + const char * i_sMultiLineEndToken ); ~Context_AdocStd(); - // OPERATIONS - virtual void AssignDealer( - TokenDealer & o_rDealer ); + // OPERATIONS + virtual void AssignDealer( + TokenDealer & o_rDealer ); - virtual void ReadCharChain( - CharacterSource & io_rText ); - virtual bool PassNewToken(); - virtual void SetMode_IsMultiLine( - bool i_bTrue ); - // INQUIRY + virtual void ReadCharChain( + CharacterSource & io_rText ); + virtual bool PassNewToken(); + virtual void SetMode_IsMultiLine( + bool i_bTrue ); + // INQUIRY virtual TkpContext & FollowUpContext(); private: - // SERVICE FUNCTIONS - virtual void PerformStatusFunction( - uintt i_nStatusSignal, - F_CRTOK i_fTokenCreateFunction, - CharacterSource & io_rText ); + // SERVICE FUNCTIONS + virtual void PerformStatusFunction( + uintt i_nStatusSignal, + F_CRTOK i_fTokenCreateFunction, + CharacterSource & io_rText ); - void SetupStateMachine(); + void SetupStateMachine(); - // DATA - StateMachine aStateMachine; - TokenDealer * pDealer; + // DATA + StateMachine aStateMachine; + TokenDealer * pDealer; // Contexts - TkpContext * pParentContext; - TkpContext * pFollowUpContext; - Dyn<Cx_LineStart> pCx_LineStart; - Dyn<Cx_CheckStar> pCx_CheckStar; + TkpContext * pParentContext; + TkpContext * pFollowUpContext; + Dyn<Cx_LineStart> pCx_LineStart; + Dyn<Cx_CheckStar> pCx_CheckStar; Dyn<Cx_AtTagCompletion> pCx_AtTagCompletion; // Temporary data, used during ReadCharChain() - Dyn<TextToken> pNewToken; + Dyn<TextToken> pNewToken; bool bIsMultiline; }; diff --git a/autodoc/source/parser/inc/adoc/cx_a_sub.hxx b/autodoc/source/parser/inc/adoc/cx_a_sub.hxx index 43fe2fca8449..5e649c420f76 100644 --- a/autodoc/source/parser/inc/adoc/cx_a_sub.hxx +++ b/autodoc/source/parser/inc/adoc/cx_a_sub.hxx @@ -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 @@ -47,28 +47,28 @@ class Cx_LineStart : public TkpContext { public: Cx_LineStart( - TkpContext & i_rFollowUpContext ); + TkpContext & i_rFollowUpContext ); - virtual void ReadCharChain( - CharacterSource & io_rText ); - virtual bool PassNewToken(); + virtual void ReadCharChain( + CharacterSource & io_rText ); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); - void SetCurToken( - TextToken::F_CRTOK i_fTokenCreateFunction ) + void SetCurToken( + TextToken::F_CRTOK i_fTokenCreateFunction ) { fCur_TokenCreateFunction = i_fTokenCreateFunction; } void AssignDealer( - TokenDealer & o_rDealer ) + TokenDealer & o_rDealer ) { pDealer = &o_rDealer; } private: // DATA - TokenDealer * pDealer; - TkpContext * pFollowUpContext; + TokenDealer * pDealer; + TkpContext * pFollowUpContext; - Dyn<TextToken> pNewToken; + Dyn<TextToken> pNewToken; - TextToken::F_CRTOK fCur_TokenCreateFunction; + TextToken::F_CRTOK fCur_TokenCreateFunction; }; @@ -81,33 +81,33 @@ class Cx_CheckStar : public TkpContext public: // LIFECYCLE Cx_CheckStar( - TkpContext & i_rFollowUpContext ); - void Set_End_FollowUpContext( - TkpContext & i_rEnd_FollowUpContext ) + TkpContext & i_rFollowUpContext ); + void Set_End_FollowUpContext( + TkpContext & i_rEnd_FollowUpContext ) { pEnd_FollowUpContext = &i_rEnd_FollowUpContext; } - virtual void ReadCharChain( - CharacterSource & io_rText ); - virtual bool PassNewToken(); + virtual void ReadCharChain( + CharacterSource & io_rText ); + virtual bool PassNewToken(); - void SetCanBeEnd( - bool i_bCanBeEnd ) + void SetCanBeEnd( + bool i_bCanBeEnd ) { bCanBeEnd = i_bCanBeEnd; } virtual TkpContext & FollowUpContext(); void AssignDealer( - TokenDealer & o_rDealer ) + TokenDealer & o_rDealer ) { pDealer = &o_rDealer; } private: // DATA - TokenDealer * pDealer; - TkpContext * pFollowUpContext; - TkpContext * pEnd_FollowUpContext; + TokenDealer * pDealer; + TkpContext * pFollowUpContext; + TkpContext * pEnd_FollowUpContext; - Dyn<TextToken> pNewToken; + Dyn<TextToken> pNewToken; - bool bCanBeEnd; - bool bEndTokenFound; + bool bCanBeEnd; + bool bEndTokenFound; }; @@ -115,28 +115,28 @@ class Cx_AtTagCompletion : public TkpContext { public: Cx_AtTagCompletion( - TkpContext & i_rFollowUpContext ); + TkpContext & i_rFollowUpContext ); - virtual void ReadCharChain( - CharacterSource & io_rText ); - virtual bool PassNewToken(); + virtual void ReadCharChain( + CharacterSource & io_rText ); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); - void SetCurToken( - TextToken::F_CRTOK i_fTokenCreateFunction ) + void SetCurToken( + TextToken::F_CRTOK i_fTokenCreateFunction ) { fCur_TokenCreateFunction = i_fTokenCreateFunction; } void AssignDealer( - TokenDealer & o_rDealer ) + TokenDealer & o_rDealer ) { pDealer = &o_rDealer; } private: // DATA - TokenDealer * pDealer; - TkpContext * pFollowUpContext; + TokenDealer * pDealer; + TkpContext * pFollowUpContext; - Dyn<TextToken> pNewToken; + Dyn<TextToken> pNewToken; - TextToken::F_CRTOK fCur_TokenCreateFunction; + TextToken::F_CRTOK fCur_TokenCreateFunction; }; diff --git a/autodoc/source/parser/inc/adoc/docu_pe.hxx b/autodoc/source/parser/inc/adoc/docu_pe.hxx index ef49b2594c79..c4487e69b8cf 100644 --- a/autodoc/source/parser/inc/adoc/docu_pe.hxx +++ b/autodoc/source/parser/inc/adoc/docu_pe.hxx @@ -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 @@ -61,81 +61,81 @@ class Adoc_PE : public TokenInterpreter Adoc_PE(); ~Adoc_PE(); - virtual void Hdl_at_std( - const Tok_at_std & i_rTok ); - virtual void Hdl_at_base( - const Tok_at_base & i_rTok ); - virtual void Hdl_at_exception( + virtual void Hdl_at_std( + const Tok_at_std & i_rTok ); + virtual void Hdl_at_base( + const Tok_at_base & i_rTok ); + virtual void Hdl_at_exception( const Tok_at_exception & i_rTok ); - virtual void Hdl_at_impl( - const Tok_at_impl & i_rTok ); - virtual void Hdl_at_key( - const Tok_at_key & i_rTok ); - virtual void Hdl_at_param( + virtual void Hdl_at_impl( + const Tok_at_impl & i_rTok ); + virtual void Hdl_at_key( + const Tok_at_key & i_rTok ); + virtual void Hdl_at_param( const Tok_at_param & i_rTok ); - virtual void Hdl_at_see( - const Tok_at_see & i_rTok ); - virtual void Hdl_at_template( + virtual void Hdl_at_see( + const Tok_at_see & i_rTok ); + virtual void Hdl_at_template( const Tok_at_template & i_rTok ); - virtual void Hdl_at_interface( + virtual void Hdl_at_interface( const Tok_at_interface & i_rTok ); - virtual void Hdl_at_internal( + virtual void Hdl_at_internal( const Tok_at_internal & i_rTok ); - virtual void Hdl_at_obsolete( + virtual void Hdl_at_obsolete( const Tok_at_obsolete & i_rTok ); - virtual void Hdl_at_module( + virtual void Hdl_at_module( const Tok_at_module & i_rTok ); - virtual void Hdl_at_file( - const Tok_at_file & i_rTok ); - virtual void Hdl_at_gloss( + virtual void Hdl_at_file( + const Tok_at_file & i_rTok ); + virtual void Hdl_at_gloss( const Tok_at_gloss & i_rTok ); - virtual void Hdl_at_global( + virtual void Hdl_at_global( const Tok_at_global & i_rTok ); - virtual void Hdl_at_include( + virtual void Hdl_at_include( const Tok_at_include & i_rTok ); - virtual void Hdl_at_label( + virtual void Hdl_at_label( const Tok_at_label & i_rTok ); - virtual void Hdl_at_since( + virtual void Hdl_at_since( const Tok_at_since & i_rTok ); - virtual void Hdl_at_HTML( + virtual void Hdl_at_HTML( const Tok_at_HTML & i_rTok ); - virtual void Hdl_at_NOHTML( + virtual void Hdl_at_NOHTML( const Tok_at_NOHTML & i_rTok ); - virtual void Hdl_DocWord( - const Tok_DocWord & i_rTok ); + virtual void Hdl_DocWord( + const Tok_DocWord & i_rTok ); - virtual void Hdl_Whitespace( + virtual void Hdl_Whitespace( const Tok_Whitespace & i_rTok ); - virtual void Hdl_LineStart( + virtual void Hdl_LineStart( const Tok_LineStart & i_rTok ); - virtual void Hdl_Eol( - const Tok_Eol & i_rTok ); + virtual void Hdl_Eol( + const Tok_Eol & i_rTok ); - virtual void Hdl_EoDocu( - const Tok_EoDocu & i_rTok ); + virtual void Hdl_EoDocu( + const Tok_EoDocu & i_rTok ); DYN ary::doc::OldCppDocu * ReleaseJustParsedDocu(); - bool IsComplete() const; + bool IsComplete() const; private: void InstallAtTag( @@ -144,7 +144,7 @@ class Adoc_PE : public TokenInterpreter bool i_bImplicit = false ); /// True for implicit @short and @descr. ary::doc::OldCppDocu & CurDocu(); - ary::info::AtTag & CurAtTag(); + ary::info::AtTag & CurAtTag(); bool UsesHtmlInDocuText(); void RenameCurShortTag(); @@ -168,10 +168,10 @@ class Adoc_PE : public TokenInterpreter Dyn<ary::doc::OldCppDocu> pCurDocu; - ary::info::AtTag * pCurAtTag; + ary::info::AtTag * pCurAtTag; uintt nLineCountInDocu; - UINT8 nCurSpecialMeaningTokens; - UINT8 nCurSubtractFromLineStart; + UINT8 nCurSpecialMeaningTokens; + UINT8 nCurSubtractFromLineStart; E_TagState eCurTagState; E_DocuState eDocuState; bool bIsComplete; diff --git a/autodoc/source/parser/inc/adoc/prs_adoc.hxx b/autodoc/source/parser/inc/adoc/prs_adoc.hxx index 5326552dd017..35d601b23062 100644 --- a/autodoc/source/parser/inc/adoc/prs_adoc.hxx +++ b/autodoc/source/parser/inc/adoc/prs_adoc.hxx @@ -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 @@ -41,7 +41,7 @@ class DocuParser_AutodocStyle : public autodoc::DocumentationParser_Ifc { public: DocuParser_AutodocStyle(); - virtual ~DocuParser_AutodocStyle(); + virtual ~DocuParser_AutodocStyle(); virtual DYN autodoc::TkpDocuContext * Create_DocuContext() const; diff --git a/autodoc/source/parser/inc/adoc/tk_attag.hxx b/autodoc/source/parser/inc/adoc/tk_attag.hxx index 11c21124e67d..923c4018171c 100644 --- a/autodoc/source/parser/inc/adoc/tk_attag.hxx +++ b/autodoc/source/parser/inc/adoc/tk_attag.hxx @@ -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 @@ -45,24 +45,24 @@ class Tok_at_std : public Token { public: Tok_at_std( - E_AtTagId i_nId ) + E_AtTagId i_nId ) : eId(i_nId) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; - E_AtTagId Id() const { return eId; } + E_AtTagId Id() const { return eId; } private: - E_AtTagId eId; + E_AtTagId eId; }; #define DECL_TOKEN_CLASS(name) \ class Tok_##name : public Token \ { public: \ - virtual void Trigger( \ - TokenInterpreter & io_rInterpreter ) const; \ + virtual void Trigger( \ + TokenInterpreter & io_rInterpreter ) const; \ virtual const char * \ Text() const; \ } diff --git a/autodoc/source/parser/inc/adoc/tk_docw.hxx b/autodoc/source/parser/inc/adoc/tk_docw.hxx index fa53d8968826..f8c8f2bc4783 100644 --- a/autodoc/source/parser/inc/adoc/tk_docw.hxx +++ b/autodoc/source/parser/inc/adoc/tk_docw.hxx @@ -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,18 +43,18 @@ class Tok_DocWord : public Token public: // Spring and Fall Tok_DocWord( - const char * i_sText ) - : sText(i_sText) {} + const char * i_sText ) + : sText(i_sText) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; uintt Length() const { return sText.length(); } private: // DATA - String sText; + String sText; }; class Tok_Whitespace : public Token @@ -62,18 +62,18 @@ class Tok_Whitespace : public Token public: // Spring and Fall Tok_Whitespace( - UINT8 i_nSize ) - : nSize(i_nSize) {} + UINT8 i_nSize ) + : nSize(i_nSize) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - UINT8 Size() const { return nSize; } + virtual const char* Text() const; + UINT8 Size() const { return nSize; } private: // DATA - UINT8 nSize; + UINT8 nSize; }; class Tok_LineStart : public Token @@ -81,32 +81,32 @@ class Tok_LineStart : public Token public: // Spring and Fall Tok_LineStart( - UINT8 i_nSize ) - : nSize(i_nSize) {} + UINT8 i_nSize ) + : nSize(i_nSize) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - UINT8 Size() const { return nSize; } + virtual const char* Text() const; + UINT8 Size() const { return nSize; } private: // DATA - UINT8 nSize; + UINT8 nSize; }; class Tok_Eol : public Token { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; class Tok_EoDocu : public Token { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; diff --git a/autodoc/source/parser/inc/adoc/tokintpr.hxx b/autodoc/source/parser/inc/adoc/tokintpr.hxx index f24b2ea80a97..5fc0ca8aec6c 100644 --- a/autodoc/source/parser/inc/adoc/tokintpr.hxx +++ b/autodoc/source/parser/inc/adoc/tokintpr.hxx @@ -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 @@ -68,7 +68,7 @@ class Tok_EoDocu; #define DECL_TOK_HANDLER(token) \ - virtual void Hdl_##token( \ + virtual void Hdl_##token( \ const Tok_##token & i_rTok ) = 0 @@ -76,7 +76,7 @@ class Tok_EoDocu; class TokenInterpreter { public: - virtual ~TokenInterpreter() {} + virtual ~TokenInterpreter() {} DECL_TOK_HANDLER(at_std); DECL_TOK_HANDLER(at_base); diff --git a/autodoc/source/parser/inc/cpp/ctokdeal.hxx b/autodoc/source/parser/inc/cpp/ctokdeal.hxx index 9d1f59c08e53..9b1e89403cca 100644 --- a/autodoc/source/parser/inc/cpp/ctokdeal.hxx +++ b/autodoc/source/parser/inc/cpp/ctokdeal.hxx @@ -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 @@ -49,8 +49,8 @@ class TokenDealer : virtual public ::TokenDealer { public: - virtual void Deal_CppCode( - cpp::Token & let_drToken ) = 0; + virtual void Deal_CppCode( + cpp::Token & let_drToken ) = 0; /** This is to be used only by the internal macro expander ( ::cpp::PreProcessor ). diff --git a/autodoc/source/parser/inc/cpp/prs_cpp.hxx b/autodoc/source/parser/inc/cpp/prs_cpp.hxx index 61512f24b54f..fe2525cff354 100644 --- a/autodoc/source/parser/inc/cpp/prs_cpp.hxx +++ b/autodoc/source/parser/inc/cpp/prs_cpp.hxx @@ -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 @@ -46,15 +46,15 @@ class Cpluplus_Parser : public autodoc::CodeParser_Ifc { public: Cpluplus_Parser(); - virtual ~Cpluplus_Parser(); + virtual ~Cpluplus_Parser(); - virtual void Setup( + virtual void Setup( ary::Repository & o_rRepository, const autodoc::DocumentationParser_Ifc & i_rDocumentationInterpreter ); - virtual void Run( + virtual void Run( const autodoc::FileCollector_Ifc & i_rFiles ); private: diff --git a/autodoc/source/parser/inc/doc_deal.hxx b/autodoc/source/parser/inc/doc_deal.hxx index f9b12c8b2299..4f94016fc28e 100644 --- a/autodoc/source/parser/inc/doc_deal.hxx +++ b/autodoc/source/parser/inc/doc_deal.hxx @@ -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 @@ -49,7 +49,7 @@ class DocuDealer { public: // INQUIRY - virtual ~DocuDealer() {} + virtual ~DocuDealer() {} // OPERATIONS /** @descr diff --git a/autodoc/source/parser/inc/semantic/callf.hxx b/autodoc/source/parser/inc/semantic/callf.hxx index 6a8c829e00ee..6f06d36a16bf 100644 --- a/autodoc/source/parser/inc/semantic/callf.hxx +++ b/autodoc/source/parser/inc/semantic/callf.hxx @@ -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 @@ -34,7 +34,7 @@ -/** This represents a function to be called, if a specific kind of token +/** This represents a function to be called, if a specific kind of token arrives in the semantic parser. @descr This class is only to be used as member of PeStatus<PE>. @@ -49,20 +49,20 @@ class CallFunction typedef void (PE::*F_Tok)(const char *); CallFunction( - F_Tok i_f2Call, - INT16 i_nTokType ); + F_Tok i_f2Call, + INT16 i_nTokType ); - F_Tok GetF() const; - INT16 TokType() const; + F_Tok GetF() const; + INT16 TokType() const; private: // DATA - F_Tok f2Call; - INT16 nTokType; + F_Tok f2Call; + INT16 nTokType; }; -/** One state within a ParseEnvironment. +/** One state within a ParseEnvironment. @template PE The owning ParseEnvironment. @@ -74,27 +74,27 @@ class PeStatus typedef typename CallFunction<PE>::F_Tok F_Tok; PeStatus( - PE & i_rMyPE, - uintt i_nSize, - F_Tok * i_pFuncArray, + PE & i_rMyPE, + uintt i_nSize, + F_Tok * i_pFuncArray, INT16 * i_pTokTypeArray, - F_Tok i_pDefault ); + F_Tok i_pDefault ); virtual ~PeStatus(); - virtual void Call_Handler( - INT16 i_nTokTypeId, - const char * i_sTokenText ) const; + virtual void Call_Handler( + INT16 i_nTokTypeId, + const char * i_sTokenText ) const; private: - bool CheckForCall( - uintt i_nPos, - INT16 i_nTokTypeId, - const char * i_sTokenText ) const; + bool CheckForCall( + uintt i_nPos, + INT16 i_nTokTypeId, + const char * i_sTokenText ) const; - PE * pMyPE; + PE * pMyPE; std::vector< CallFunction<PE> > aBranches; - F_Tok fDefault; + F_Tok fDefault; }; @@ -102,26 +102,26 @@ template <class PE> class PeStatusArray { public: - typedef typename PE::E_State State; + typedef typename PE::E_State State; PeStatusArray(); - void InsertState( - State i_ePosition, - DYN PeStatus<PE> & let_drState ); + void InsertState( + State i_ePosition, + DYN PeStatus<PE> & let_drState ); ~PeStatusArray(); const PeStatus<PE> & operator[]( - State i_ePosition ) const; + State i_ePosition ) const; - void SetCur( - State i_eCurState ); + void SetCur( + State i_eCurState ); const PeStatus<PE> & Cur() const; private: - DYN PeStatus<PE> * aStati[PE::size_of_states]; - State eState; + DYN PeStatus<PE> * aStati[PE::size_of_states]; + State eState; }; @@ -132,9 +132,9 @@ class PeStatusArray // CallFunction template <class PE> -CallFunction<PE>::CallFunction( F_Tok i_f2Call, - INT16 i_nTokType ) - : f2Call(i_f2Call), +CallFunction<PE>::CallFunction( F_Tok i_f2Call, + INT16 i_nTokType ) + : f2Call(i_f2Call), nTokType(i_nTokType) { } @@ -158,18 +158,18 @@ CallFunction<PE>::TokType() const // PeStatus template <class PE> -PeStatus<PE>::PeStatus( PE & i_rMyPE, - uintt i_nSize, - F_Tok * i_pFuncArray, +PeStatus<PE>::PeStatus( PE & i_rMyPE, + uintt i_nSize, + F_Tok * i_pFuncArray, INT16 * i_pTokTypeArray, - F_Tok i_fDefault ) - : pMyPE(&i_rMyPE), + F_Tok i_fDefault ) + : pMyPE(&i_rMyPE), fDefault(i_fDefault) { aBranches.reserve(i_nSize); for ( uintt i = 0; i < i_nSize; ++i ) { -// csv_assert(i > 0 ? i_pTokTypeArray[i] > i_pTokTypeArray[i-1] : true); +// csv_assert(i > 0 ? i_pTokTypeArray[i] > i_pTokTypeArray[i-1] : true); aBranches.push_back( CallFunction<PE>( i_pFuncArray[i], i_pTokTypeArray[i]) ); } // end for } @@ -182,8 +182,8 @@ PeStatus<PE>::~PeStatus() template <class PE> void -PeStatus<PE>::Call_Handler( INT16 i_nTokTypeId, - const char * i_sTokenText ) const +PeStatus<PE>::Call_Handler( INT16 i_nTokTypeId, + const char * i_sTokenText ) const { uintt nSize = aBranches.size(); uintt nPos = nSize / 2; @@ -210,9 +210,9 @@ PeStatus<PE>::Call_Handler( INT16 i_nTokTypeId, template <class PE> bool -PeStatus<PE>::CheckForCall( uintt i_nPos, - INT16 i_nTokTypeId, - const char * i_sTokenText ) const +PeStatus<PE>::CheckForCall( uintt i_nPos, + INT16 i_nTokTypeId, + const char * i_sTokenText ) const { if ( aBranches[i_nPos].TokType() == i_nTokTypeId ) { @@ -226,15 +226,15 @@ PeStatus<PE>::CheckForCall( uintt i_nPos, template <class PE> PeStatusArray<PE>::PeStatusArray() - : eState(PE::size_of_states) + : eState(PE::size_of_states) { memset(aStati, 0, sizeof aStati); } template <class PE> void -PeStatusArray<PE>::InsertState( State i_ePosition, - DYN PeStatus<PE> & let_drState ) +PeStatusArray<PE>::InsertState( State i_ePosition, + DYN PeStatus<PE> & let_drState ) { csv_assert(aStati[i_ePosition] == 0); aStati[i_ePosition] = &let_drState; diff --git a/autodoc/source/parser/inc/semantic/parseenv.hxx b/autodoc/source/parser/inc/semantic/parseenv.hxx index 058989ea3739..7f03e1d566f6 100644 --- a/autodoc/source/parser/inc/semantic/parseenv.hxx +++ b/autodoc/source/parser/inc/semantic/parseenv.hxx @@ -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 @@ -54,39 +54,39 @@ class SubPeUseIfc; class ParseEnvironment : protected TokenProcessing_Types { public: - virtual ~ParseEnvironment() {} + virtual ~ParseEnvironment() {} // Parsing - void Enter( - E_EnvStackAction i_eWayOfEntering ); - void Leave( - E_EnvStackAction i_eWayOfLeaving ); - void SetCurSPU( - const SubPeUseIfc * i_pCurSPU ); + void Enter( + E_EnvStackAction i_eWayOfEntering ); + void Leave( + E_EnvStackAction i_eWayOfLeaving ); + void SetCurSPU( + const SubPeUseIfc * i_pCurSPU ); - ParseEnvironment * Parent() const; + ParseEnvironment * Parent() const; // ACCESS protected: ParseEnvironment( - ParseEnvironment * i_pParent ); - const SubPeUseIfc * CurSubPeUse() const; + ParseEnvironment * i_pParent ); + const SubPeUseIfc * CurSubPeUse() const; private: - virtual void InitData() = 0; - virtual void TransferData() = 0; + virtual void InitData() = 0; + virtual void TransferData() = 0; - ParseEnvironment * pParent; + ParseEnvironment * pParent; const SubPeUseIfc * pCurSubPe; }; class SubPeUseIfc { public: - virtual ~SubPeUseIfc() {} + virtual ~SubPeUseIfc() {} - virtual void InitParse() const = 0; - virtual void GetResults() const = 0; + virtual void InitParse() const = 0; + virtual void GetResults() const = 0; }; diff --git a/autodoc/source/parser/inc/semantic/sub_pe.hxx b/autodoc/source/parser/inc/semantic/sub_pe.hxx index 0aef6804eafe..4885a5fa05ce 100644 --- a/autodoc/source/parser/inc/semantic/sub_pe.hxx +++ b/autodoc/source/parser/inc/semantic/sub_pe.hxx @@ -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,20 +43,20 @@ template <class PE, class SUB> class SubPe { public: - typedef SubPe< PE, SUB > self; + typedef SubPe< PE, SUB > self; SubPe( - PE & i_rParent ); - PE & Parent() const; - SUB & Child() const; + PE & i_rParent ); + PE & Parent() const; + SUB & Child() const; - ParseEnvironment & Get() const; + ParseEnvironment & Get() const; private: - SUB & CreateChild() const; + SUB & CreateChild() const; - PE & rParent; - Dyn<SUB> pChild; + PE & rParent; + Dyn<SUB> pChild; }; @@ -64,11 +64,11 @@ class SubPe // IMPLEMENTATION -// SubPe +// SubPe template <class PE, class SUB> SubPe<PE,SUB>::SubPe( PE & i_rParent ) - : rParent(i_rParent) + : rParent(i_rParent) { } diff --git a/autodoc/source/parser/inc/semantic/sub_peu.hxx b/autodoc/source/parser/inc/semantic/sub_peu.hxx index 9960e3e751e2..ac641ac6d25e 100644 --- a/autodoc/source/parser/inc/semantic/sub_peu.hxx +++ b/autodoc/source/parser/inc/semantic/sub_peu.hxx @@ -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 @@ -50,24 +50,24 @@ class SubPeUse : public SubPeUseIfc, typedef void (PE::*F_RETURN)(); SubPeUse( - SubPe<PE,SUB> & i_rSubPeCreator, - F_INIT i_fInit, - F_RETURN i_fReturn ); + SubPe<PE,SUB> & i_rSubPeCreator, + F_INIT i_fInit, + F_RETURN i_fReturn ); ~SubPeUse(); - void Push( - E_TokenDone i_eDone ); - virtual void InitParse() const; - virtual void GetResults() const; + void Push( + E_TokenDone i_eDone ); + virtual void InitParse() const; + virtual void GetResults() const; PE & Parent() const; SUB & Child() const; private: // DATA - SubPe<PE,SUB> & rSubPeCreator; + SubPe<PE,SUB> & rSubPeCreator; F_INIT fInit; - F_RETURN fReturn; + F_RETURN fReturn; }; @@ -75,10 +75,10 @@ class SubPeUse : public SubPeUseIfc, template <class PE, class SUB> -SubPeUse<PE,SUB>::SubPeUse( SubPe<PE,SUB> & i_rSubPeCreator, - F_INIT i_fInit, - F_RETURN i_fReturn ) - : rSubPeCreator(i_rSubPeCreator), +SubPeUse<PE,SUB>::SubPeUse( SubPe<PE,SUB> & i_rSubPeCreator, + F_INIT i_fInit, + F_RETURN i_fReturn ) + : rSubPeCreator(i_rSubPeCreator), fInit(i_fInit), fReturn(i_fReturn) { diff --git a/autodoc/source/parser/inc/tokens/parseinc.hxx b/autodoc/source/parser/inc/tokens/parseinc.hxx index 0f01fab399c0..73c6c0568518 100644 --- a/autodoc/source/parser/inc/tokens/parseinc.hxx +++ b/autodoc/source/parser/inc/tokens/parseinc.hxx @@ -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 @@ -177,10 +177,10 @@ jumpOverEol(CharacterSource & io_rText) } -inline char // Finds a matching closing bracket after the opening one is passed +inline char // Finds a matching closing bracket after the opening one is passed jumpToMatchingBracket( CharacterSource & io_rText, - char in_cBegin, - char in_cEnd ) + char in_cBegin, + char in_cEnd ) { intt nCounter = 1; char cNext; diff --git a/autodoc/source/parser/inc/tokens/stmstarr.hxx b/autodoc/source/parser/inc/tokens/stmstarr.hxx index 640177faf363..e4433661244c 100644 --- a/autodoc/source/parser/inc/tokens/stmstarr.hxx +++ b/autodoc/source/parser/inc/tokens/stmstarr.hxx @@ -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 @@ -44,32 +44,32 @@ class StmArrayStatus : public StmStatus // LIFECYCLE StmArrayStatus( - intt i_nStatusSize, - const INT16 * in_aArrayModel, - F_CRTOK i_fTokenCreateFunction, - bool in_bIsDefault ); + intt i_nStatusSize, + const INT16 * in_aArrayModel, + F_CRTOK i_fTokenCreateFunction, + bool in_bIsDefault ); ~StmArrayStatus(); // INQUIRY - StmStatus::Branch NextBy( - intt in_nFollowersIndex) const; - F_CRTOK TokenCreateFunction() const + StmStatus::Branch NextBy( + intt in_nFollowersIndex) const; + F_CRTOK TokenCreateFunction() const { return fTokenCreateFunction; } - virtual bool IsADefault() const; + virtual bool IsADefault() const; // ACCESS virtual StmArrayStatus * AsArray(); - bool SetBranch( - intt in_nBranchIx, - StmStatus::Branch in_nBranch ); - void SetTokenCreateFunction( - F_CRTOK i_fTokenCreateFunction ); + bool SetBranch( + intt in_nBranchIx, + StmStatus::Branch in_nBranch ); + void SetTokenCreateFunction( + F_CRTOK i_fTokenCreateFunction ); private: - StmStatus::Branch * dpBranches; - intt nNrOfBranches; - F_CRTOK fTokenCreateFunction; - bool bIsADefault; + StmStatus::Branch * dpBranches; + intt nNrOfBranches; + F_CRTOK fTokenCreateFunction; + bool bIsADefault; }; diff --git a/autodoc/source/parser/inc/tokens/stmstate.hxx b/autodoc/source/parser/inc/tokens/stmstate.hxx index e966b4740b75..f9ce54a554ea 100644 --- a/autodoc/source/parser/inc/tokens/stmstate.hxx +++ b/autodoc/source/parser/inc/tokens/stmstate.hxx @@ -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 @@ -36,21 +36,21 @@ class StmArrayStatus; class StmBoundsStatus; -/** A StmStatus is a state within a StateMachine. +/** A StmStatus is a state within a StateMachine. There are two kinds of it. Either its an array of pointers to other states within the state machine - an ArrayStatus. Or it is a BoundsStatus, which shows, the token cannot be followed further within the StateMachine. **/ -class StmStatus // := "State machine status" +class StmStatus // := "State machine status" { public: - typedef intt Branch; /// Values >= 0 give a next #Status' ID. + typedef intt Branch; /// Values >= 0 give a next #Status' ID. /// Values <= 0 tell, that a token is finished. /// a value < 0 returns the status back to an upper level state machine. // LIFECYCLE - virtual ~StmStatus() {} + virtual ~StmStatus() {} // OPERATIONS virtual StmArrayStatus * @@ -59,7 +59,7 @@ class StmStatus // := "State machine status" AsBounds(); // INQUIRY - virtual bool IsADefault() const = 0; + virtual bool IsADefault() const = 0; }; diff --git a/autodoc/source/parser/inc/tokens/stmstfin.hxx b/autodoc/source/parser/inc/tokens/stmstfin.hxx index 7ded64933bb5..846fdf2efcb6 100644 --- a/autodoc/source/parser/inc/tokens/stmstfin.hxx +++ b/autodoc/source/parser/inc/tokens/stmstfin.hxx @@ -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 @@ -48,13 +48,13 @@ class StmBoundsStatus : public StmStatus StmBoundsStatus( StateMachineContext & o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ); + TkpContext & i_rFollowUpContext, + uintt i_nStatusFunctionNr, + bool i_bIsDefault ); // INQUIRY - TkpContext * FollowUpContext(); - uintt StatusFunctionNr() const; - virtual bool IsADefault() const; + TkpContext * FollowUpContext(); + uintt StatusFunctionNr() const; + virtual bool IsADefault() const; // ACCESS virtual StmBoundsStatus * @@ -63,9 +63,9 @@ class StmBoundsStatus : public StmStatus private: StateMachineContext * pOwner; - TkpContext * pFollowUpContext; - uintt nStatusFunctionNr; - bool bIsDefault; + TkpContext * pFollowUpContext; + uintt nStatusFunctionNr; + bool bIsDefault; }; inline TkpContext * diff --git a/autodoc/source/parser/inc/tokens/tkp.hxx b/autodoc/source/parser/inc/tokens/tkp.hxx index 97fc9578ae5c..eb361e049195 100644 --- a/autodoc/source/parser/inc/tokens/tkp.hxx +++ b/autodoc/source/parser/inc/tokens/tkp.hxx @@ -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 @@ -55,37 +55,37 @@ class TokenParser public: // LIFECYCLE TokenParser(); - virtual ~TokenParser() {} + virtual ~TokenParser() {} // OPERATIONS /** Start parsing a character source. Any previously parsed sources are discarded. */ - virtual void Start( + virtual void Start( CharacterSource & i_rSource ); - /** @short Gets the next identifiable token out of the + /** @short Gets the next identifiable token out of the source code. */ - void GetNextToken(); + void GetNextToken(); /// @return true, if there are more tokens to parse. - bool HasMore() const { return bHasMore; } + bool HasMore() const { return bHasMore; } private: void InitSource( CharacterSource & i_rSource ); - virtual void SetStartContext() = 0; + virtual void SetStartContext() = 0; virtual void SetCurrentContext( - TkpContext & io_rContext ) = 0; + TkpContext & io_rContext ) = 0; virtual TkpContext & CurrentContext() = 0; // DATA - CharacterSource * pChars; - bool bHasMore; + CharacterSource * pChars; + bool bHasMore; }; diff --git a/autodoc/source/parser/inc/tokens/tkpcontx.hxx b/autodoc/source/parser/inc/tokens/tkpcontx.hxx index c8818b4bfc20..d838cbe2f5cf 100644 --- a/autodoc/source/parser/inc/tokens/tkpcontx.hxx +++ b/autodoc/source/parser/inc/tokens/tkpcontx.hxx @@ -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 @@ -37,7 +37,7 @@ class CharacterSource; class TkpNullContext; -/** @task +/** @task Specifies a context within which tokens are interpreted in a special way. For example in parsing C++ there could be a context for code, one for comments and a third one for preprocessor statements, because @@ -54,7 +54,7 @@ class TkpContext { public: // LIFECYCLE - virtual ~TkpContext() {} + virtual ~TkpContext() {} // OPERATIONS /** @descr @@ -75,8 +75,8 @@ class TkpContext passes the parsed token to the internally known receiver and returns true. The token is cut from io_rText. **/ - virtual void ReadCharChain( - CharacterSource & io_rText ) = 0; + virtual void ReadCharChain( + CharacterSource & io_rText ) = 0; /** Has to pass the parsed token to a known receiver. If the token is to be parsed further in a different context, PassNewToken() returns false, but the token is NOT cut from io_rText. @@ -85,7 +85,7 @@ class TkpContext false, if the token was not parsed completely by this context or if the token is to be ignored. */ - virtual bool PassNewToken() = 0; + virtual bool PassNewToken() = 0; virtual TkpContext & FollowUpContext() = 0; @@ -101,10 +101,10 @@ class StateMachineContext virtual ~StateMachineContext() {} /// Is used by StmBoundsStatus only. - virtual void PerformStatusFunction( - uintt i_nStatusSignal, - F_CRTOK i_fTokenCreateFunction, - CharacterSource & io_rText ) = 0; + virtual void PerformStatusFunction( + uintt i_nStatusSignal, + F_CRTOK i_fTokenCreateFunction, + CharacterSource & io_rText ) = 0; }; class TkpNullContext : public TkpContext @@ -112,9 +112,9 @@ class TkpNullContext : public TkpContext public: ~TkpNullContext(); - virtual void ReadCharChain( - CharacterSource & io_rText ); - virtual bool PassNewToken(); + virtual void ReadCharChain( + CharacterSource & io_rText ); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); }; @@ -125,13 +125,13 @@ namespace autodoc class TkpDocuContext : public TkpContext { public: - virtual void SetParentContext( - TkpContext & io_rParentContext, - const char * i_sMultiLineEndToken ) = 0; - virtual void AssignDealer( - TokenDealer & o_rDealer ) = 0; - virtual void SetMode_IsMultiLine( - bool i_bTrue ) = 0; + virtual void SetParentContext( + TkpContext & io_rParentContext, + const char * i_sMultiLineEndToken ) = 0; + virtual void AssignDealer( + TokenDealer & o_rDealer ) = 0; + virtual void SetMode_IsMultiLine( + bool i_bTrue ) = 0; }; } // namespace autodoc diff --git a/autodoc/source/parser/inc/tokens/tkpstama.hxx b/autodoc/source/parser/inc/tokens/tkpstama.hxx index 9c09ba6bc808..10d36f38f31e 100644 --- a/autodoc/source/parser/inc/tokens/tkpstama.hxx +++ b/autodoc/source/parser/inc/tokens/tkpstama.hxx @@ -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 @@ -36,7 +36,7 @@ #include <tokens/stmstarr.hxx> #include <tokens/stmstfin.hxx> -/** @descr +/** @descr This state-machine models state transitions from one state to another per indices of branches. If the indices represent ascii-char-values, the state-machine can be used for recognising tokens of text. @@ -52,25 +52,25 @@ class StateMachine { public: // Types - typedef StmStatus::Branch Branch; - typedef StmStatus * * StatusList; + typedef StmStatus::Branch Branch; + typedef StmStatus * * StatusList; //# Interface self // LIFECYCLE StateMachine( - intt in_nStatusSize, - intt in_nInitial_StatusListSize ); /// The user of the constructor should guess + intt in_nStatusSize, + intt in_nInitial_StatusListSize ); /// The user of the constructor should guess /// the approximate number of stati here to - /// avoid multiple reallocations. + /// avoid multiple reallocations. /// @#AddStatus - intt AddStatus( /// @return the new #Status' ID - DYN StmStatus * let_dpStatus); + intt AddStatus( /// @return the new #Status' ID + DYN StmStatus * let_dpStatus); /// @#AddToken - void AddToken( - const char * in_sToken, - TextToken::F_CRTOK in_fTokenCreateFunction, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ); + void AddToken( + const char * in_sToken, + TextToken::F_CRTOK in_fTokenCreateFunction, + const INT16 * in_aBranches, + INT16 in_nBoundsStatus ); ~StateMachine(); @@ -79,37 +79,37 @@ class StateMachine GetCharChain( TextToken::F_CRTOK & o_nTokenCreateFunction, - CharacterSource & io_rText ); + CharacterSource & io_rText ); private: // SERVICE FUNCTIONS - StmStatus & Status( - intt in_nStatusNr) const; + StmStatus & Status( + intt in_nStatusNr) const; StmArrayStatus & CurrentStatus() const; StmBoundsStatus * BoundsStatus() const; /// Sets the PeekedStatus. - void Peek( - intt in_nBranch); + void Peek( + intt in_nBranch); - void ResizeStati(); // Adds space for 32 stati. + void ResizeStati(); // Adds space for 32 stati. // DATA - StatusList pStati; /// List of Status, implemented as simple C-array of length #nStatiSpace + StatusList pStati; /// List of Status, implemented as simple C-array of length #nStatiSpace /// with nStatiLength valid members (beginning from zero). - intt nCurrentStatus; - intt nPeekedStatus; + intt nCurrentStatus; + intt nPeekedStatus; - intt nStatusSize; /// Size of the branch array of a single status. + intt nStatusSize; /// Size of the branch array of a single status. - intt nNrofStati; /// Nr of Stati so far. - intt nStatiSpace; /// Size of allocated array for #pStati (size in items). + intt nNrofStati; /// Nr of Stati so far. + intt nStatiSpace; /// Size of allocated array for #pStati (size in items). }; -/** @#AddToken +/** @#AddToken @descr Adds a token, which will be recogniszeds by the statemachine. diff --git a/autodoc/source/parser/inc/tokens/tokdeal.hxx b/autodoc/source/parser/inc/tokens/tokdeal.hxx index 3d70cdd4ad03..7b6a27e56603 100644 --- a/autodoc/source/parser/inc/tokens/tokdeal.hxx +++ b/autodoc/source/parser/inc/tokens/tokdeal.hxx @@ -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 @@ -46,10 +46,10 @@ class TokenDealer { public: - virtual ~TokenDealer() {} + virtual ~TokenDealer() {} - virtual void Deal_Eol() = 0; - virtual void Deal_Eof() = 0; + virtual void Deal_Eol() = 0; + virtual void Deal_Eof() = 0; virtual cpp::Distributor * AsDistributor() = 0; }; diff --git a/autodoc/source/parser/inc/tokens/token.hxx b/autodoc/source/parser/inc/tokens/token.hxx index f44ca2917372..26d4976ae20c 100644 --- a/autodoc/source/parser/inc/tokens/token.hxx +++ b/autodoc/source/parser/inc/tokens/token.hxx @@ -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 @@ -45,21 +45,21 @@ class TextToken typedef TextToken * (*F_CRTOK)(const char*); // LIFECYCLE - virtual ~TextToken() {} + virtual ~TextToken() {} // INQUIRY - virtual const char* Text() const = 0; + virtual const char* Text() const = 0; - virtual void DealOut( - ::TokenDealer & o_rDealer ) = 0; + virtual void DealOut( + ::TokenDealer & o_rDealer ) = 0; }; class Tok_Eof : public TextToken { - virtual void DealOut( // Implemented in tokdeal.cxx - TokenDealer & o_rDealer ); - virtual const char* Text() const; + virtual void DealOut( // Implemented in tokdeal.cxx + TokenDealer & o_rDealer ); + virtual const char* Text() const; }; #endif diff --git a/autodoc/source/parser/inc/tokens/tokproct.hxx b/autodoc/source/parser/inc/tokens/tokproct.hxx index 8fdcef957290..401e3fe191bc 100644 --- a/autodoc/source/parser/inc/tokens/tokproct.hxx +++ b/autodoc/source/parser/inc/tokens/tokproct.hxx @@ -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 @@ -39,7 +39,7 @@ class ParseEnvironment; -/** is a parent class for classes, which take part in parsing tokens semantically. +/** is a parent class for classes, which take part in parsing tokens semantically. It provides some types for them. */ class TokenProcessing_Types @@ -53,21 +53,21 @@ class TokenProcessing_Types enum E_EnvStackAction { - stay, // same parse environment - push, // push sub environment + stay, // same parse environment + push, // push sub environment pop_success, // return to parent environment, parsing was successful pop_failure // return to parent environment, but an error occured. }; struct TokenProcessing_Result { - E_TokenDone eDone; - E_EnvStackAction eStackAction; - ParseEnvironment * pEnv2Push; + E_TokenDone eDone; + E_EnvStackAction eStackAction; + ParseEnvironment * pEnv2Push; TokenProcessing_Result() : eDone(not_done), eStackAction(stay), pEnv2Push(0) {} - void Reset() { eDone = not_done; eStackAction = stay; pEnv2Push = 0; } + void Reset() { eDone = not_done; eStackAction = stay; pEnv2Push = 0; } }; enum E_ParseResult diff --git a/autodoc/source/parser/inc/x_docu.hxx b/autodoc/source/parser/inc/x_docu.hxx index faf14b0591d2..5967c766259f 100644 --- a/autodoc/source/parser/inc/x_docu.hxx +++ b/autodoc/source/parser/inc/x_docu.hxx @@ -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 @@ -44,13 +44,13 @@ class X_Docu : public autodoc::X_Parser_Ifc const char * i_explanation ); ~X_Docu(); // INQUIRY - virtual E_Event GetEvent() const; - virtual void GetInfo( + virtual E_Event GetEvent() const; + virtual void GetInfo( std::ostream & o_rOutputMedium ) const; private: - String sTagName; - String sExplanation; + String sTagName; + String sExplanation; }; diff --git a/autodoc/source/parser/inc/x_parse.hxx b/autodoc/source/parser/inc/x_parse.hxx index 593c7661d9bc..57be17cfaede 100644 --- a/autodoc/source/parser/inc/x_parse.hxx +++ b/autodoc/source/parser/inc/x_parse.hxx @@ -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 @@ -40,21 +40,21 @@ class X_Parser : public autodoc::X_Parser_Ifc public: // LIFECYCLE X_Parser( - E_Event i_eEvent, - const char * i_sObject, + E_Event i_eEvent, + const char * i_sObject, const String & i_sCausingFile_FullPath, - uintt i_nCausingLineNr ); + uintt i_nCausingLineNr ); ~X_Parser(); // INQUIRY - virtual E_Event GetEvent() const; - virtual void GetInfo( + virtual E_Event GetEvent() const; + virtual void GetInfo( std::ostream & o_rOutputMedium ) const; private: - E_Event eEvent; - String sObject; - String sCausingFile_FullPath; - uintt nCausingLineNr; + E_Event eEvent; + String sObject; + String sCausingFile_FullPath; + uintt nCausingLineNr; }; diff --git a/autodoc/source/parser/kernel/parsefct.cxx b/autodoc/source/parser/kernel/parsefct.cxx index 0f157a4159e6..da6d9e576ac1 100644 --- a/autodoc/source/parser/kernel/parsefct.cxx +++ b/autodoc/source/parser/kernel/parsefct.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 diff --git a/autodoc/source/parser/kernel/parsefct.hxx b/autodoc/source/parser/kernel/parsefct.hxx index b4cfa443f007..0978d562bb41 100644 --- a/autodoc/source/parser/kernel/parsefct.hxx +++ b/autodoc/source/parser/kernel/parsefct.hxx @@ -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 @@ -40,7 +40,7 @@ class ParseToolsFactory : public autodoc::ParseToolsFactory_Ifc { public: ParseToolsFactory(); - virtual ~ParseToolsFactory(); + virtual ~ParseToolsFactory(); virtual DYN autodoc::CodeParser_Ifc * Create_Parser_Cplusplus() const; diff --git a/autodoc/source/parser/kernel/x_docu.cxx b/autodoc/source/parser/kernel/x_docu.cxx index 529073675810..4484eb8e4978 100644 --- a/autodoc/source/parser/kernel/x_docu.cxx +++ b/autodoc/source/parser/kernel/x_docu.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 @@ -35,7 +35,7 @@ X_Docu::X_Docu( const char * i_tag, const char * i_explanation ) - : sTagName(i_tag), + : sTagName(i_tag), sExplanation(i_explanation) { } diff --git a/autodoc/source/parser/kernel/x_parse.cxx b/autodoc/source/parser/kernel/x_parse.cxx index f06de7f96f96..26ee3e5d895c 100644 --- a/autodoc/source/parser/kernel/x_parse.cxx +++ b/autodoc/source/parser/kernel/x_parse.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 @@ -33,11 +33,11 @@ -X_Parser::X_Parser( E_Event i_eEvent, - const char * i_sObject, +X_Parser::X_Parser( E_Event i_eEvent, + const char * i_sObject, const String & i_sCausingFile_FullPath, - uintt i_nCausingLineNr ) - : eEvent(i_eEvent), + uintt i_nCausingLineNr ) + : eEvent(i_eEvent), sObject(i_sObject), sCausingFile_FullPath(i_sCausingFile_FullPath), nCausingLineNr(i_nCausingLineNr) @@ -85,7 +85,7 @@ X_Parser::GetInfo( std::ostream & o_rOutputMedium ) const case x_Any: default: o_rOutputMedium << "Unspecified parsing exception."; - } // end switch + } // end switch o_rOutputMedium << Endl(); } diff --git a/autodoc/source/parser/semantic/parseenv.cxx b/autodoc/source/parser/semantic/parseenv.cxx index aa998d038542..d73f8cc52a56 100644 --- a/autodoc/source/parser/semantic/parseenv.cxx +++ b/autodoc/source/parser/semantic/parseenv.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 @@ -36,7 +36,7 @@ void -ParseEnvironment::Enter( E_EnvStackAction i_eWayOfEntering ) +ParseEnvironment::Enter( E_EnvStackAction i_eWayOfEntering ) { switch (i_eWayOfEntering) { @@ -54,11 +54,11 @@ ParseEnvironment::Enter( E_EnvStackAction i_eWayOfEntering ) break; default: csv_assert(false); - } // end switch + } // end switch } void -ParseEnvironment::Leave( E_EnvStackAction i_eWayOfLeaving ) +ParseEnvironment::Leave( E_EnvStackAction i_eWayOfLeaving ) { switch (i_eWayOfLeaving) { @@ -76,11 +76,11 @@ ParseEnvironment::Leave( E_EnvStackAction i_eWayOfLeaving ) break; default: csv_assert(false); - } // end switch + } // end switch } -ParseEnvironment::ParseEnvironment( ParseEnvironment * i_pParent ) - : pParent(i_pParent), +ParseEnvironment::ParseEnvironment( ParseEnvironment * i_pParent ) + : pParent(i_pParent), // pDocu, pCurSubPe(0) { diff --git a/autodoc/source/parser/tokens/stmstarr.cxx b/autodoc/source/parser/tokens/stmstarr.cxx index 8070fae3a450..1d86c0ef9aec 100644 --- a/autodoc/source/parser/tokens/stmstarr.cxx +++ b/autodoc/source/parser/tokens/stmstarr.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 @@ -35,11 +35,11 @@ -StmArrayStatus::StmArrayStatus( intt i_nStatusSize, - const INT16 * in_aArrayModel, - F_CRTOK i_fTokenCreateFunction, - bool in_bIsDefault ) - : dpBranches(new StmStatus::Branch[i_nStatusSize]), +StmArrayStatus::StmArrayStatus( intt i_nStatusSize, + const INT16 * in_aArrayModel, + F_CRTOK i_fTokenCreateFunction, + bool in_bIsDefault ) + : dpBranches(new StmStatus::Branch[i_nStatusSize]), nNrOfBranches(i_nStatusSize), fTokenCreateFunction(i_fTokenCreateFunction), bIsADefault(in_bIsDefault) @@ -62,7 +62,7 @@ StmArrayStatus::~StmArrayStatus() } bool -StmArrayStatus::SetBranch( intt in_nBranchIx, +StmArrayStatus::SetBranch( intt in_nBranchIx, StmStatus::Branch in_nBranch ) { if ( csv::in_range(intt(0), in_nBranchIx, intt(nNrOfBranches) ) ) @@ -81,7 +81,7 @@ StmArrayStatus::NextBy(intt in_nIndex) const throw X_Parser(X_Parser::x_InvalidChar, "", String::Null_(), 0); return in_nIndex < nNrOfBranches - ? dpBranches[in_nIndex] + ? dpBranches[in_nIndex] : dpBranches[nNrOfBranches - 1]; } @@ -93,7 +93,7 @@ StmArrayStatus::IsADefault() const } StmArrayStatus * -StmArrayStatus::AsArray() +StmArrayStatus::AsArray() { return this; } diff --git a/autodoc/source/parser/tokens/stmstate.cxx b/autodoc/source/parser/tokens/stmstate.cxx index 6530ebbbe838..2752a79a9563 100644 --- a/autodoc/source/parser/tokens/stmstate.cxx +++ b/autodoc/source/parser/tokens/stmstate.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 diff --git a/autodoc/source/parser/tokens/stmstfin.cxx b/autodoc/source/parser/tokens/stmstfin.cxx index 84b7a9cf39e9..f84d7849e938 100644 --- a/autodoc/source/parser/tokens/stmstfin.cxx +++ b/autodoc/source/parser/tokens/stmstfin.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 @@ -36,10 +36,10 @@ StmBoundsStatus::StmBoundsStatus( StateMachineContext & o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ) - : pOwner(&o_rOwner), + TkpContext & i_rFollowUpContext, + uintt i_nStatusFunctionNr, + bool i_bIsDefault ) + : pOwner(&o_rOwner), pFollowUpContext(&i_rFollowUpContext), nStatusFunctionNr(i_nStatusFunctionNr), bIsDefault(i_bIsDefault) diff --git a/autodoc/source/parser/tokens/tkp.cxx b/autodoc/source/parser/tokens/tkp.cxx index 7be7bcb55842..64922f0cb2e1 100644 --- a/autodoc/source/parser/tokens/tkp.cxx +++ b/autodoc/source/parser/tokens/tkp.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 @@ -36,7 +36,7 @@ TokenParser::TokenParser() - : pChars(0), + : pChars(0), bHasMore(false) { } diff --git a/autodoc/source/parser/tokens/tkpcontx.cxx b/autodoc/source/parser/tokens/tkpcontx.cxx index c1979bfe6c44..8c129ea41d27 100644 --- a/autodoc/source/parser/tokens/tkpcontx.cxx +++ b/autodoc/source/parser/tokens/tkpcontx.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 diff --git a/autodoc/source/parser/tokens/tkpstama.cxx b/autodoc/source/parser/tokens/tkpstama.cxx index bf27299ef63c..52e0ba66a392 100644 --- a/autodoc/source/parser/tokens/tkpstama.cxx +++ b/autodoc/source/parser/tokens/tkpstama.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 @@ -36,12 +36,12 @@ #include <tools/tkpchars.hxx> -const intt C_nStatuslistResizeValue = 32; -const intt C_nTopStatus = 0; +const intt C_nStatuslistResizeValue = 32; +const intt C_nTopStatus = 0; -StateMachine::StateMachine( intt in_nStatusSize, - intt in_nInitial_StatusListSize ) - : pStati(new StmStatus*[in_nInitial_StatusListSize]), +StateMachine::StateMachine( intt in_nStatusSize, + intt in_nInitial_StatusListSize ) + : pStati(new StmStatus*[in_nInitial_StatusListSize]), nCurrentStatus(C_nTopStatus), nPeekedStatus(C_nTopStatus), nStatusSize(in_nStatusSize), @@ -66,10 +66,10 @@ StateMachine::AddStatus(StmStatus * let_dpStatus) } void -StateMachine::AddToken( const char * in_sToken, - TextToken::F_CRTOK in_fTokenCreateFunction, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ) +StateMachine::AddToken( const char * in_sToken, + TextToken::F_CRTOK in_fTokenCreateFunction, + const INT16 * in_aBranches, + INT16 in_nBoundsStatus ) { if (csv::no_str(in_sToken)) return; @@ -90,14 +90,14 @@ StateMachine::AddToken( const char * in_sToken, CurrentStatus().SetBranch( *pChar, nPeekedStatus ); } nCurrentStatus = nPeekedStatus; - } // end for + } // end for StmArrayStatus & rLastStatus = CurrentStatus(); rLastStatus.SetTokenCreateFunction(in_fTokenCreateFunction); for (intt i = 0; i < nStatusSize; i++) { if (Status(rLastStatus.NextBy(i)).AsBounds() != 0) rLastStatus.SetBranch(i,in_nBoundsStatus); - } // end for + } // end for } StateMachine::~StateMachine() @@ -110,7 +110,7 @@ StateMachine::~StateMachine() } StmBoundsStatus & -StateMachine::GetCharChain( TextToken::F_CRTOK & o_nTokenCreateFunction, +StateMachine::GetCharChain( TextToken::F_CRTOK & o_nTokenCreateFunction, CharacterSource & io_rText ) { nCurrentStatus = C_nTopStatus; @@ -159,8 +159,8 @@ StateMachine::CurrentStatus() const StmArrayStatus * pCurSt = Status(nCurrentStatus).AsArray(); csv_assert(pCurSt != 0); -// if(pCurSt == 0) -// csv_assert(false); +// if(pCurSt == 0) +// csv_assert(false); return *pCurSt; } @@ -171,7 +171,7 @@ StateMachine::BoundsStatus() const } void -StateMachine::Peek(intt in_nBranch) +StateMachine::Peek(intt in_nBranch) { StmArrayStatus & rSt = CurrentStatus(); nPeekedStatus = rSt.NextBy(in_nBranch); diff --git a/autodoc/source/parser/tokens/tokdeal.cxx b/autodoc/source/parser/tokens/tokdeal.cxx index 561a638a3233..6486b46b600d 100644 --- a/autodoc/source/parser/tokens/tokdeal.cxx +++ b/autodoc/source/parser/tokens/tokdeal.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 @@ -36,7 +36,7 @@ void -Tok_Eof::DealOut( TokenDealer & o_rDealer ) +Tok_Eof::DealOut( TokenDealer & o_rDealer ) { o_rDealer.Deal_Eof(); }; diff --git a/autodoc/source/parser_i/idl/cx_idlco.cxx b/autodoc/source/parser_i/idl/cx_idlco.cxx index 42ace9448462..877b7fe45eea 100644 --- a/autodoc/source/parser_i/idl/cx_idlco.cxx +++ b/autodoc/source/parser_i/idl/cx_idlco.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 @@ -151,9 +151,9 @@ const UINT16 nTok_EOF = 802; -Context_UidlCode::Context_UidlCode( Token_Receiver & o_rReceiver, +Context_UidlCode::Context_UidlCode( Token_Receiver & o_rReceiver, DYN TkpDocuContext & let_drContext_Docu ) - : aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati), + : aStateMachine(C_nStatusSize,C_nCppInitialNrOfStati), pReceiver(&o_rReceiver), pDocuContext(&let_drContext_Docu), dpContext_MLComment(0), @@ -185,7 +185,7 @@ Context_UidlCode::ReadCharChain( CharacterSource & io_rText ) StmBoundsStatu2 & rBound = aStateMachine.GetCharChain(nTokenId, io_rText); // !!! - // The order of the next two lines is essential, because + // The order of the next two lines is essential, because // pFollowUpContext may be changed by PerformStatusFunction() also, // which then MUST override the previous assignment. pFollowUpContext = rBound.FollowUpContext(); @@ -211,9 +211,9 @@ Context_UidlCode::FollowUpContext() } void -Context_UidlCode::PerformStatusFunction( uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ) +Context_UidlCode::PerformStatusFunction( uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ) { switch (i_nStatusSignal) { @@ -265,7 +265,7 @@ Context_UidlCode::PerformStatusFunction( uintt i_nStatusSignal, break; default: csv_assert(false); - } // end switch ( i_nTokenId / 50 ) + } // end switch ( i_nTokenId / 50 ) break; case nF_fin_Punctuation: io_rText.CutToken(); @@ -302,19 +302,19 @@ Context_UidlCode::PerformStatusFunction( uintt i_nStatusSignal, break; default: csv_assert(false); - } // end switch (i_nStatusSignal) + } // end switch (i_nStatusSignal) } void Context_UidlCode::SetupStateMachine() { // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel): -// const INT16 top = 0; // Top-Status - const INT16 wht = 1; // Whitespace-überlese-Status - const INT16 bez = 2; // Bezeichner-lese-Status +// const INT16 top = 0; // Top-Status + const INT16 wht = 1; // Whitespace-überlese-Status + const INT16 bez = 2; // Bezeichner-lese-Status // Tokenfinish-Stati: - const INT16 finErr = 3; + const INT16 finErr = 3; const INT16 finIgn = 4; const INT16 finBez = 5; const INT16 finKeyw = 6; @@ -323,25 +323,25 @@ Context_UidlCode::SetupStateMachine() const INT16 finEOF = 9; // Kontextwechsel-Stati: - const INT16 gotoMld = 10; - const INT16 gotoSld = 11; - const INT16 gotoMlc = 12; - const INT16 gotoSlc = 13; + const INT16 gotoMld = 10; + const INT16 gotoSld = 11; + const INT16 gotoMlc = 12; + const INT16 gotoSlc = 13; const INT16 gotoPrp = 14; - const INT16 gotoAsg = 15; + const INT16 gotoAsg = 15; // Konstanten zur Benutzung in der Tabelle: const INT16 err = finErr; const INT16 fbz = finBez; const INT16 fig = finIgn; const INT16 fof = finEOF; -// const INT16 fkw = finKeyw; -// const INT16 fpc = finPunct; +// const INT16 fkw = finKeyw; +// const INT16 fpc = finPunct; /// Die '0'en werden spaeter durch AddToken() ersetzt. const INT16 A_nTopStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fof,err,err,err,err,err,err,err,err,wht, 0,wht,wht, 0,err,err, err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ... wht,err,wht, 0,err,err,err,err, 0, 0,err,err, 0, 0, 0,err, @@ -353,7 +353,7 @@ Context_UidlCode::SetupStateMachine() }; const INT16 A_nWhitespaceStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fof,err,err,err,err,err,err,err,err,wht,fig,wht,wht,fig,err,err, err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // 16 ... wht,fig,wht,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig,fig, @@ -365,7 +365,7 @@ Context_UidlCode::SetupStateMachine() }; const INT16 A_nBezeichnerStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err, err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ... fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz, @@ -377,7 +377,7 @@ Context_UidlCode::SetupStateMachine() }; const INT16 A_nPunctDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ... err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, @@ -389,7 +389,7 @@ Context_UidlCode::SetupStateMachine() }; const INT16 A_nKeywordDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fbz,err,err,err,err,err,err,err,err,fbz,fbz,fbz,fbz,fbz,err,err, err,err,err,err,err,err,err,err,err,err,fbz,err,err,err,err,err, // 16 ... fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz,fbz, @@ -407,32 +407,32 @@ Context_UidlCode::SetupStateMachine() DYN StmArrayStatu2 * dpStatusBez = new StmArrayStatu2( C_nStatusSize, A_nBezeichnerStatus, 0, true); - DYN StmBoundsStatu2 * dpBst_finErr + DYN StmBoundsStatu2 * dpBst_finErr = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true ); - DYN StmBoundsStatu2 * dpBst_finIgn + DYN StmBoundsStatu2 * dpBst_finIgn = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true ); - DYN StmBoundsStatu2 * dpBst_finBez + DYN StmBoundsStatu2 * dpBst_finBez = new StmBoundsStatu2( *this, *this, nF_fin_Identifier, true ); - DYN StmBoundsStatu2 * dpBst_finKeyw + DYN StmBoundsStatu2 * dpBst_finKeyw = new StmBoundsStatu2( *this, *this, nF_fin_Keyword, false ); - DYN StmBoundsStatu2 * dpBst_finPunct + DYN StmBoundsStatu2 * dpBst_finPunct = new StmBoundsStatu2( *this, *this, nF_fin_Punctuation, false ); - DYN StmBoundsStatu2 * dpBst_finEOL + DYN StmBoundsStatu2 * dpBst_finEOL = new StmBoundsStatu2( *this, *this, nF_fin_EOL, false ); - DYN StmBoundsStatu2 * dpBst_finEOF + DYN StmBoundsStatu2 * dpBst_finEOF = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_EOF, false ); - DYN StmBoundsStatu2 * dpBst_gotoMld + DYN StmBoundsStatu2 * dpBst_gotoMld = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_MLDocu, false ); - DYN StmBoundsStatu2 * dpBst_gotoSld + DYN StmBoundsStatu2 * dpBst_gotoSld = new StmBoundsStatu2( *this, *pDocuContext, nF_goto_SLDocu, false ); - DYN StmBoundsStatu2 * dpBst_gotoMlc + DYN StmBoundsStatu2 * dpBst_gotoMlc = new StmBoundsStatu2( *this, *dpContext_MLComment, nF_goto_MLComment, false ); - DYN StmBoundsStatu2 * dpBst_gotoSlc + DYN StmBoundsStatu2 * dpBst_gotoSlc = new StmBoundsStatu2( *this, *dpContext_SLComment, nF_goto_SLComment, false ); - DYN StmBoundsStatu2 * dpBst_gotoPrp + DYN StmBoundsStatu2 * dpBst_gotoPrp = new StmBoundsStatu2( *this, *dpContext_Preprocessor, nF_goto_Praeprocessor, false ); - DYN StmBoundsStatu2 * dpBst_gotoAsg + DYN StmBoundsStatu2 * dpBst_gotoAsg = new StmBoundsStatu2( *this, *dpContext_Assignment, nF_goto_Assignment, false ); // dpMain aufbauen: @@ -456,8 +456,8 @@ Context_UidlCode::SetupStateMachine() aStateMachine.AddStatus(dpBst_gotoPrp); aStateMachine.AddStatus(dpBst_gotoAsg); - aStateMachine.AddToken("any", nTok_bty_any, A_nKeywordDefStatus, finKeyw); - aStateMachine.AddToken("attribute", nTok_mt_attribute, A_nKeywordDefStatus, finKeyw); + aStateMachine.AddToken("any", nTok_bty_any, A_nKeywordDefStatus, finKeyw); + aStateMachine.AddToken("attribute", nTok_mt_attribute, A_nKeywordDefStatus, finKeyw); aStateMachine.AddToken("boolean", nTok_bty_boolean, A_nKeywordDefStatus, finKeyw); aStateMachine.AddToken("bound", nTok_ste_bound, A_nKeywordDefStatus, finKeyw); aStateMachine.AddToken("byte", nTok_bty_byte, A_nKeywordDefStatus, finKeyw); @@ -517,7 +517,7 @@ Context_UidlCode::SetupStateMachine() A_nPunctDefStatus, finPunct); aStateMachine.AddToken("}", nTok_punct_CurledBracketClose, A_nPunctDefStatus, finPunct); - aStateMachine.AddToken("<", nTok_punct_Lesser, A_nPunctDefStatus, finPunct); + aStateMachine.AddToken("<", nTok_punct_Lesser, A_nPunctDefStatus, finPunct); aStateMachine.AddToken(">", nTok_punct_Greater, A_nPunctDefStatus, finPunct); aStateMachine.AddToken(";", nTok_punct_Semicolon, A_nPunctDefStatus, finPunct); aStateMachine.AddToken(":", nTok_punct_Colon, A_nPunctDefStatus, finPunct); @@ -526,7 +526,7 @@ Context_UidlCode::SetupStateMachine() aStateMachine.AddToken("-", nTok_punct_Minus, A_nPunctDefStatus, finPunct); aStateMachine.AddToken(".", nTok_punct_Fullstop, A_nPunctDefStatus, finPunct); aStateMachine.AddToken("/**", nTok_none_MLDocuBegin, A_nPunctDefStatus, gotoMld); - aStateMachine.AddToken("///", nTok_none_SLDocuBegin, A_nPunctDefStatus, gotoSld); + aStateMachine.AddToken("///", nTok_none_SLDocuBegin, A_nPunctDefStatus, gotoSld); aStateMachine.AddToken("/*", nTok_none_MLCommentBegin, A_nPunctDefStatus, gotoMlc); aStateMachine.AddToken("//", nTok_none_SLCommentBegin, diff --git a/autodoc/source/parser_i/idl/cx_sub.cxx b/autodoc/source/parser_i/idl/cx_sub.cxx index e098d6cc1c3c..facf23f68909 100644 --- a/autodoc/source/parser_i/idl/cx_sub.cxx +++ b/autodoc/source/parser_i/idl/cx_sub.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 @@ -63,7 +63,7 @@ Cx_Base::FollowUpContext() } void -Context_MLComment::ReadCharChain( CharacterSource & io_rText ) +Context_MLComment::ReadCharChain( CharacterSource & io_rText ) { char cNext = NULCH; @@ -89,7 +89,7 @@ Context_MLComment::ReadCharChain( CharacterSource & io_rText ) } void -Context_SLComment::ReadCharChain( CharacterSource & io_rText ) +Context_SLComment::ReadCharChain( CharacterSource & io_rText ) { jumpToEol(io_rText); if (io_rText.CurChar() != NULCH) @@ -101,7 +101,7 @@ Context_SLComment::ReadCharChain( CharacterSource & io_rText ) } void -Context_Praeprocessor::ReadCharChain( CharacterSource & io_rText ) +Context_Praeprocessor::ReadCharChain( CharacterSource & io_rText ) { jumpToEol(io_rText); if (io_rText.CurChar() != NULCH) @@ -113,7 +113,7 @@ Context_Praeprocessor::ReadCharChain( CharacterSource & io_rText ) } void -Context_Assignment::ReadCharChain( CharacterSource & io_rText ) +Context_Assignment::ReadCharChain( CharacterSource & io_rText ) { // KORR_FUTURE // How to handle new lines within this, so he y get realised by @@ -134,7 +134,7 @@ Context_Assignment::ReadCharChain( CharacterSource & io_rText ) io_rText.MoveOn(); } cNext = io_rText.MoveOn(); - } // endif (cNext == '"') + } // endif (cNext == '"') } while (cNext != ';' AND cNext != ',' AND cNext != '}'); if (cNext == ',' OR cNext == ';') diff --git a/autodoc/source/parser_i/idl/distrib.cxx b/autodoc/source/parser_i/idl/distrib.cxx index 75c245bfa96e..3c8cb6a2698c 100644 --- a/autodoc/source/parser_i/idl/distrib.cxx +++ b/autodoc/source/parser_i/idl/distrib.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 @@ -42,7 +42,7 @@ -const uintt C_nNO_TRY = uintt(-1); +const uintt C_nNO_TRY = uintt(-1); namespace csi @@ -52,7 +52,7 @@ namespace uidl TokenDistributor::TokenDistributor( ary::Repository & io_rRepository, ParserInfo & io_rParserInfo ) - : pTokenSource(0), + : pTokenSource(0), aDocumentation(io_rParserInfo), aProcessingData( io_rRepository, aDocumentation, io_rParserInfo ) { @@ -75,10 +75,10 @@ TokenDistributor::TradeToken() } TokenDistributor::ProcessingData::ProcessingData( - ary::Repository & io_rRepository, - Documentation & i_rDocuProcessor, + ary::Repository & io_rRepository, + Documentation & i_rDocuProcessor, ParserInfo & io_rParserInfo ) - : // aEnvironments + : // aEnvironments // aTokenQueue // itCurToken // aCurResult @@ -203,10 +203,10 @@ TokenDistributor::ProcessingData::AcknowledgeResult() DecrementTryCount(); aEnvironments.pop_back(); CurEnv().Enter(pop_failure); - } break; + } break; default: csv_assert(false); - } // end switch(aCurResult.eStackAction) + } // end switch(aCurResult.eStackAction) } void @@ -222,7 +222,7 @@ TokenDistributor::ProcessingData::DecrementTryCount() TokenDistributor:: Documentation::Documentation(ParserInfo & io_rParserInfo) - : pDocuParseEnv(new csi::dsapi::SapiDocu_PE(io_rParserInfo)), + : pDocuParseEnv(new csi::dsapi::SapiDocu_PE(io_rParserInfo)), rParserInfo(io_rParserInfo), pMostRecentDocu(0), bIsPassedFirstDocu(false) @@ -246,7 +246,7 @@ Documentation::Receive( DYN csi::dsapi::Token & let_drToken ) pMostRecentDocu = pDocuParseEnv->ReleaseJustParsedDocu(); if (NOT bIsPassedFirstDocu) { - pMostRecentDocu = 0; // Deletes the most recent docu. + pMostRecentDocu = 0; // Deletes the most recent docu. bIsPassedFirstDocu = true; } } diff --git a/autodoc/source/parser_i/idl/parsenv2.cxx b/autodoc/source/parser_i/idl/parsenv2.cxx index 4327ae1e3cbd..cd8d6d7f93d7 100644 --- a/autodoc/source/parser_i/idl/parsenv2.cxx +++ b/autodoc/source/parser_i/idl/parsenv2.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 @@ -60,8 +60,8 @@ UnoIDL_PE::~UnoIDL_PE() } void -UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { pRepository = &io_rRepository; @@ -69,15 +69,15 @@ UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, } //void -//UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, -// ary::idl::Gate & io_rGate, -// TokenProcessing_Result & o_rResult ) +//UnoIDL_PE::EstablishContacts( UnoIDL_PE * io_pParentPE, +// ary::idl::Gate & io_rGate, +// TokenProcessing_Result & o_rResult ) //{ -// aMyNode.EstablishContacts(io_pParentPE, io_rGate, o_rResult); +// aMyNode.EstablishContacts(io_pParentPE, io_rGate, o_rResult); //} void -UnoIDL_PE::Enter( E_EnvStackAction i_eWayOfEntering ) +UnoIDL_PE::Enter( E_EnvStackAction i_eWayOfEntering ) { switch (i_eWayOfEntering) { @@ -95,11 +95,11 @@ UnoIDL_PE::Enter( E_EnvStackAction i_eWayOfEntering ) // no break because of throw default: csv_assert(false); - } // end switch + } // end switch } void -UnoIDL_PE::Leave( E_EnvStackAction i_eWayOfLeaving ) +UnoIDL_PE::Leave( E_EnvStackAction i_eWayOfLeaving ) { switch (i_eWayOfLeaving) { @@ -116,7 +116,7 @@ UnoIDL_PE::Leave( E_EnvStackAction i_eWayOfLeaving ) // no break because of throw default: csv_assert(false); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_attri.cxx b/autodoc/source/parser_i/idl/pe_attri.cxx index 31fe8063ea6c..fe362c429915 100644 --- a/autodoc/source/parser_i/idl/pe_attri.cxx +++ b/autodoc/source/parser_i/idl/pe_attri.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 @@ -68,8 +68,8 @@ PE_Attribute::PE_Attribute( const Ce_id & i_rCurOwner ) void PE_Attribute::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_const.cxx b/autodoc/source/parser_i/idl/pe_const.cxx index 4013f33d02d7..7b07b8d858e6 100644 --- a/autodoc/source/parser_i/idl/pe_const.cxx +++ b/autodoc/source/parser_i/idl/pe_const.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 @@ -51,11 +51,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Constant::On_Default +#define DF &PE_Constant::On_Default PE_Constant::F_TOK PE_Constant::aDispatcher[PE_Constant::e_STATES_MAX][PE_Constant::tt_MAX] = - { { DF, DF, DF }, // e_none + { { DF, DF, DF }, // e_none { DF, &PE_Constant::On_expect_name_Identifier, DF }, // expect_name { DF, DF, &PE_Constant::On_expect_curl_bracket_open_Punctuation }, // expect_curl_bracket_open @@ -69,15 +69,15 @@ PE_Constant::aDispatcher[PE_Constant::e_STATES_MAX][PE_Constant::tt_MAX] = inline void -PE_Constant::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Constant::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } PE_Constant::PE_Constant() - : eState(e_none), + : eState(e_none), sData_Name(), nDataId(0), pPE_Type(0), @@ -91,9 +91,9 @@ PE_Constant::PE_Constant() } void -PE_Constant::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Constant::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Type->EstablishContacts(this,io_rRepository,o_rResult); @@ -256,11 +256,11 @@ PE_Constant::ReceiveData() CreateSingleConstant(); EmptySingleConstData(); eState = expect_const; - } break; + } break; default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_enum2.cxx b/autodoc/source/parser_i/idl/pe_enum2.cxx index 68fb46d48a56..e6e96cfd2b15 100644 --- a/autodoc/source/parser_i/idl/pe_enum2.cxx +++ b/autodoc/source/parser_i/idl/pe_enum2.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 @@ -51,11 +51,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Enum::On_Default +#define DF &PE_Enum::On_Default PE_Enum::F_TOK PE_Enum::aDispatcher[PE_Enum::e_STATES_MAX][PE_Enum::tt_MAX] = - { { DF, DF }, // e_none + { { DF, DF }, // e_none { &PE_Enum::On_expect_name_Identifier, DF }, // expect_name { DF, &PE_Enum::On_expect_curl_bracket_open_Punctuation }, // expect_curl_bracket_open @@ -67,15 +67,15 @@ PE_Enum::aDispatcher[PE_Enum::e_STATES_MAX][PE_Enum::tt_MAX] = inline void -PE_Enum::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Enum::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } PE_Enum::PE_Enum() - : eState(e_none), + : eState(e_none), sData_Name(), nDataId(0), pPE_Value(0), @@ -86,9 +86,9 @@ PE_Enum::PE_Enum() } void -PE_Enum::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Enum::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Value->EstablishContacts(this,io_rRepository,o_rResult); @@ -227,11 +227,11 @@ PE_Enum::ReceiveData() CreateSingleValue(); EmptySingleValueData(); - } break; + } break; default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_evalu.cxx b/autodoc/source/parser_i/idl/pe_evalu.cxx index 4e1aafabb10b..2d754e8da4bb 100644 --- a/autodoc/source/parser_i/idl/pe_evalu.cxx +++ b/autodoc/source/parser_i/idl/pe_evalu.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 @@ -48,11 +48,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Value::On_Default +#define DF &PE_Value::On_Default PE_Value::F_TOK PE_Value::aDispatcher[PE_Value::e_STATES_MAX][PE_Value::tt_MAX] = - { { DF, DF, DF }, // e_none + { { DF, DF, DF }, // e_none { &PE_Value::On_expect_name_Identifier, DF, DF }, // expect_name { DF, &PE_Value::On_got_name_Punctuation, @@ -62,18 +62,18 @@ PE_Value::aDispatcher[PE_Value::e_STATES_MAX][PE_Value::tt_MAX] = inline void -PE_Value::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Value::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } -PE_Value::PE_Value( String & o_rName, - String & o_rAssignment, - bool i_bIsConst ) - : eState(e_none), +PE_Value::PE_Value( String & o_rName, + String & o_rAssignment, + bool i_bIsConst ) + : eState(e_none), pName(&o_rName), pAssignment(&o_rAssignment), bIsConst(i_bIsConst) @@ -81,9 +81,9 @@ PE_Value::PE_Value( String & o_rName, } void -PE_Value::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Value::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); } diff --git a/autodoc/source/parser_i/idl/pe_excp.cxx b/autodoc/source/parser_i/idl/pe_excp.cxx index 23d3843583bb..76ee2d4f71ed 100644 --- a/autodoc/source/parser_i/idl/pe_excp.cxx +++ b/autodoc/source/parser_i/idl/pe_excp.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 @@ -51,16 +51,16 @@ namespace uidl PE_Exception::PE_Exception() - // : aWork, + // : aWork, // pStati { pStati = new S_Stati(*this); } void -PE_Exception::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Exception::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); Work().pPE_Element->EstablishContacts(this,io_rRepository,o_rResult); @@ -103,7 +103,7 @@ PE_Exception::ReceiveData() } PE_Exception::S_Work::S_Work() - : sData_Name(), + : sData_Name(), bIsPreDeclaration(false), nCurStruct(0), pPE_Element(0), @@ -146,7 +146,7 @@ PE_Exception::S_Work::Data_Set_Name( const char * i_sName ) } PE_Exception::S_Stati::S_Stati(PE_Exception & io_rStruct) - : aNone(io_rStruct), + : aNone(io_rStruct), aWaitForName(io_rStruct), aGotName(io_rStruct), aWaitForBase(io_rStruct), @@ -159,7 +159,7 @@ PE_Exception::S_Stati::S_Stati(PE_Exception & io_rStruct) } -//*********************** Stati ***************************// +//*********************** Stati ***************************// UnoIDL_PE & @@ -196,7 +196,7 @@ PE_Exception::State_GotName::Process_Punctuation( const TokPunctuation & i_rToke break; default: SetResult(not_done,pop_failure); - } // end switch + } // end switch } else { diff --git a/autodoc/source/parser_i/idl/pe_file2.cxx b/autodoc/source/parser_i/idl/pe_file2.cxx index 144470f8945e..f6caa5e8d765 100644 --- a/autodoc/source/parser_i/idl/pe_file2.cxx +++ b/autodoc/source/parser_i/idl/pe_file2.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 @@ -59,7 +59,7 @@ namespace uidl PE_File::PE_File( TokenDistributor & i_rTokenAdmin, const ParserInfo & i_parseInfo ) - : pTokenAdmin(&i_rTokenAdmin), + : pTokenAdmin(&i_rTokenAdmin), pPE_Service(new PE_Service), pPE_Singleton(new PE_Singleton), pPE_Interface(new PE_Interface), @@ -76,9 +76,9 @@ PE_File::PE_File( TokenDistributor & i_rTokenAdmin, } void -PE_File::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_File::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Service->EstablishContacts(this,io_rRepository,o_rResult); @@ -123,7 +123,7 @@ PE_File::Process_Identifier( const TokIdentifier & i_rToken ) SetResult(done, stay); eState = wait_for_module_bracket; - } break; + } break; case on_default: SetResult(done, stay); break; @@ -198,7 +198,7 @@ PE_File::Process_Punctuation( const TokPunctuation & i_rToken ) } void -PE_File::Process_MetaType( const TokMetaType & i_rToken ) +PE_File::Process_MetaType( const TokMetaType & i_rToken ) { switch (i_rToken.Id()) { @@ -245,7 +245,7 @@ PE_File::Process_MetaType( const TokMetaType & i_rToken ) default: Process_Default(); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_func2.cxx b/autodoc/source/parser_i/idl/pe_func2.cxx index 64a0c6d65736..1e8a487caac6 100644 --- a/autodoc/source/parser_i/idl/pe_func2.cxx +++ b/autodoc/source/parser_i/idl/pe_func2.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 @@ -51,8 +51,8 @@ namespace uidl { -PE_Function::PE_Function( const RParent & i_rCurInterface ) - : eState(e_none), +PE_Function::PE_Function( const RParent & i_rCurInterface ) + : eState(e_none), sData_Name(), nData_ReturnType(0), bData_Oneway(false), @@ -67,13 +67,13 @@ PE_Function::PE_Function( const RParent & i_rCurInterface ) sCurParsedParam_Name(), bIsForConstructors(false) { - pPE_Type = new PE_Type(nCurParsedType); - pPE_Variable = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name); + pPE_Type = new PE_Type(nCurParsedType); + pPE_Variable = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name); } -PE_Function::PE_Function( const RParent & i_rCurService, +PE_Function::PE_Function( const RParent & i_rCurService, E_Constructor ) - : eState(expect_name), + : eState(expect_name), sData_Name(), nData_ReturnType(0), bData_Oneway(false), @@ -88,13 +88,13 @@ PE_Function::PE_Function( const RParent & i_rCurService, sCurParsedParam_Name(), bIsForConstructors(true) { - pPE_Type = new PE_Type(nCurParsedType); - pPE_Variable = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name); + pPE_Type = new PE_Type(nCurParsedType); + pPE_Variable = new PE_Variable(nCurParsedParam_Type, sCurParsedParam_Name); } void -PE_Function::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +PE_Function::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); @@ -125,7 +125,7 @@ PE_Function::Process_Stereotype( const TokStereotype & i_rToken ) break; default: OnDefault(); - } // end switch + } // end switch } else OnDefault(); @@ -286,7 +286,7 @@ PE_Function::Process_BuiltInType( const TokBuiltInType & i_rToken ) break; default: OnDefault(); - } // end switch + } // end switch } void @@ -344,7 +344,7 @@ PE_Function::Process_Default() break; default: OnDefault(); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_iface.cxx b/autodoc/source/parser_i/idl/pe_iface.cxx index 404c303d2c04..0853dc9513bc 100644 --- a/autodoc/source/parser_i/idl/pe_iface.cxx +++ b/autodoc/source/parser_i/idl/pe_iface.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 @@ -53,11 +53,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Interface::On_Default +#define DF &PE_Interface::On_Default PE_Interface::F_TOK PE_Interface::aDispatcher[PE_Interface::e_STATES_MAX][PE_Interface::tt_MAX] = - { { DF, DF, DF, DF, DF }, // e_none + { { DF, DF, DF, DF, DF }, // e_none { &PE_Interface::On_need_uik_MetaType, DF, DF, DF, DF }, // need_uik { DF, &PE_Interface::On_uik_Identifier, @@ -92,14 +92,14 @@ PE_Interface::aDispatcher[PE_Interface::e_STATES_MAX][PE_Interface::tt_MAX] = inline void -PE_Interface::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Interface::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } PE_Interface::PE_Interface() - : eState(e_none), + : eState(e_none), sData_Name(), bIsPreDeclaration(false), pCurInterface(0), @@ -110,15 +110,15 @@ PE_Interface::PE_Interface() nCurParsed_Base(0), bOptionalMember(false) { - pPE_Function = new PE_Function(nCurInterface); - pPE_Type = new PE_Type(nCurParsed_Base); + pPE_Function = new PE_Function(nCurInterface); + pPE_Type = new PE_Type(nCurParsed_Base); pPE_Attribute = new PE_Attribute(nCurInterface); } void -PE_Interface::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Interface::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Function->EstablishContacts(this,io_rRepository,o_rResult); @@ -138,7 +138,7 @@ PE_Interface::ProcessToken( const Token & i_rToken ) void -PE_Interface::Process_MetaType( const TokMetaType & i_rToken ) +PE_Interface::Process_MetaType( const TokMetaType & i_rToken ) { CallHandler( i_rToken.Text(), tt_metatype ); } @@ -270,7 +270,7 @@ PE_Interface::On_wait_for_base_Punctuation(const char * i_sText) default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } else { @@ -322,7 +322,7 @@ PE_Interface::On_std_Punctuation(const char * i_sText) default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } void @@ -375,7 +375,7 @@ PE_Interface::On_need_finish_Punctuation(const char * i_sText) default: SetResult(not_done, pop_failure); eState = e_none; - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_property.cxx b/autodoc/source/parser_i/idl/pe_property.cxx index fc138b3c9d27..e3176c23bbc4 100644 --- a/autodoc/source/parser_i/idl/pe_property.cxx +++ b/autodoc/source/parser_i/idl/pe_property.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 @@ -64,8 +64,8 @@ PE_Property::PE_Property( const Ce_id & i_rCurOwner ) void PE_Property::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Variable->EstablishContacts(this,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_selem.cxx b/autodoc/source/parser_i/idl/pe_selem.cxx index 7dabd57b8205..94f4e97b5c5f 100644 --- a/autodoc/source/parser_i/idl/pe_selem.cxx +++ b/autodoc/source/parser_i/idl/pe_selem.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 @@ -50,10 +50,10 @@ namespace const String C_sNone; } -PE_StructElement::PE_StructElement( RStructElement & o_rResult, - const RStruct & i_rCurStruct, +PE_StructElement::PE_StructElement( RStructElement & o_rResult, + const RStruct & i_rCurStruct, const String & i_rCurStructTemplateParam ) - : eState(e_none), + : eState(e_none), pResult(&o_rResult), pCurStruct(&i_rCurStruct), bIsExceptionElement(false), @@ -65,9 +65,9 @@ PE_StructElement::PE_StructElement( RStructElement & o_rResult, pPE_Type = new PE_Type(nType); } -PE_StructElement::PE_StructElement( RStructElement & o_rResult, - const RStruct & i_rCurExc ) - : eState(e_none), +PE_StructElement::PE_StructElement( RStructElement & o_rResult, + const RStruct & i_rCurExc ) + : eState(e_none), pResult(&o_rResult), pCurStruct(&i_rCurExc), bIsExceptionElement(true), @@ -80,9 +80,9 @@ PE_StructElement::PE_StructElement( RStructElement & o_rResult, } void -PE_StructElement::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_StructElement::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Type->EstablishContacts(this,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_servi.cxx b/autodoc/source/parser_i/idl/pe_servi.cxx index a4209c58f7be..083fdd1884bd 100644 --- a/autodoc/source/parser_i/idl/pe_servi.cxx +++ b/autodoc/source/parser_i/idl/pe_servi.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 @@ -53,7 +53,7 @@ namespace uidl PE_Service::PE_Service() - : eState(e_none), + : eState(e_none), sData_Name(), bIsPreDeclaration(false), pCurService(0), @@ -66,14 +66,14 @@ PE_Service::PE_Service() pPE_Constructor(0), bOptionalMember(false) { - pPE_Property = new PE_Property(nCurService); - pPE_Type = new PE_Type(nCurParsed_Type); + pPE_Property = new PE_Property(nCurService); + pPE_Type = new PE_Type(nCurParsed_Type); pPE_Constructor = new PE_Function(nCurService, PE_Function::constructor); } void -PE_Service::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +PE_Service::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); @@ -94,7 +94,7 @@ PE_Service::ProcessToken( const Token & i_rToken ) void -PE_Service::Process_MetaType( const TokMetaType & i_rToken ) +PE_Service::Process_MetaType( const TokMetaType & i_rToken ) { switch ( i_rToken.Id() ) { @@ -130,7 +130,7 @@ PE_Service::Process_MetaType( const TokMetaType & i_rToken ) // KORR_FUTURE: // Should throw syntax error warning. ; - } // end switch + } // end switch } void @@ -239,11 +239,11 @@ PE_Service::Process_Punctuation( const TokPunctuation & i_rToken ) break; default: On_Default(); - } // end switch + } // end switch break; default: On_Default(); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_singl.cxx b/autodoc/source/parser_i/idl/pe_singl.cxx index 292d380323ac..323ce23b55c2 100644 --- a/autodoc/source/parser_i/idl/pe_singl.cxx +++ b/autodoc/source/parser_i/idl/pe_singl.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 @@ -50,7 +50,7 @@ namespace uidl PE_Singleton::PE_Singleton() - : eState(e_none), + : eState(e_none), sData_Name(), bIsPreDeclaration(false), pCurSingleton(0), @@ -58,12 +58,12 @@ PE_Singleton::PE_Singleton() pPE_Type(0), nCurParsed_Type(0) { - pPE_Type = new PE_Type(nCurParsed_Type); + pPE_Type = new PE_Type(nCurParsed_Type); } void -PE_Singleton::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +PE_Singleton::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); @@ -82,7 +82,7 @@ PE_Singleton::ProcessToken( const Token & i_rToken ) void -PE_Singleton::Process_MetaType( const TokMetaType & i_rToken ) +PE_Singleton::Process_MetaType( const TokMetaType & i_rToken ) { switch ( i_rToken.Id() ) { @@ -106,7 +106,7 @@ PE_Singleton::Process_MetaType( const TokMetaType & i_rToken ) // Should throw syntax error warning ; - } // end switch + } // end switch } void @@ -160,7 +160,7 @@ PE_Singleton::Process_Punctuation( const TokPunctuation & i_rToken ) break; default: On_Default(); - } // end switch + } // end switch break; case TokPunctuation::Colon: switch (eState) @@ -171,11 +171,11 @@ PE_Singleton::Process_Punctuation( const TokPunctuation & i_rToken ) break; default: On_Default(); - } // end switch + } // end switch break; default: On_Default(); - } // end switch + } // end switch } void diff --git a/autodoc/source/parser_i/idl/pe_struc.cxx b/autodoc/source/parser_i/idl/pe_struc.cxx index a9dc68448ee3..766597f07809 100644 --- a/autodoc/source/parser_i/idl/pe_struc.cxx +++ b/autodoc/source/parser_i/idl/pe_struc.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 @@ -58,8 +58,8 @@ PE_Struct::PE_Struct() void PE_Struct::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); Work().pPE_Element->EstablishContacts(this,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_tydf2.cxx b/autodoc/source/parser_i/idl/pe_tydf2.cxx index 310a8f57327b..c7051f3047bd 100644 --- a/autodoc/source/parser_i/idl/pe_tydf2.cxx +++ b/autodoc/source/parser_i/idl/pe_tydf2.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 @@ -49,11 +49,11 @@ namespace uidl #ifdef DF #undef DF #endif -#define DF &PE_Typedef::On_Default +#define DF &PE_Typedef::On_Default PE_Typedef::F_TOK PE_Typedef::aDispatcher[PE_Typedef::e_STATES_MAX][PE_Typedef::tt_MAX] = - { { DF, DF, DF }, // e_none + { { DF, DF, DF }, // e_none { &PE_Typedef::On_expect_description_Any, &PE_Typedef::On_expect_description_Any, DF }, // expect_description @@ -65,8 +65,8 @@ PE_Typedef::aDispatcher[PE_Typedef::e_STATES_MAX][PE_Typedef::tt_MAX] = inline void -PE_Typedef::CallHandler( const char * i_sTokenText, - E_TokenType i_eTokenType ) +PE_Typedef::CallHandler( const char * i_sTokenText, + E_TokenType i_eTokenType ) { (this->*aDispatcher[eState][i_eTokenType])(i_sTokenText); } @@ -74,7 +74,7 @@ PE_Typedef::CallHandler( const char * i_sTokenText, PE_Typedef::PE_Typedef() - : eState(e_none), + : eState(e_none), pPE_Type(0), nType(0), sName() @@ -83,8 +83,8 @@ PE_Typedef::PE_Typedef() } void -PE_Typedef::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, +PE_Typedef::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); diff --git a/autodoc/source/parser_i/idl/pe_type2.cxx b/autodoc/source/parser_i/idl/pe_type2.cxx index fe73ce04bdca..d21d01795e81 100644 --- a/autodoc/source/parser_i/idl/pe_type2.cxx +++ b/autodoc/source/parser_i/idl/pe_type2.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 @@ -75,7 +75,7 @@ namespace uidl PE_Type::PE_Type( ary::idl::Type_id & o_rResult ) - : pResult(&o_rResult), + : pResult(&o_rResult), nIsSequenceCounter(0), nSequenceDownCounter(0), bIsUnsigned(false), diff --git a/autodoc/source/parser_i/idl/pe_vari2.cxx b/autodoc/source/parser_i/idl/pe_vari2.cxx index 8491d831c9b8..c3714a21d839 100644 --- a/autodoc/source/parser_i/idl/pe_vari2.cxx +++ b/autodoc/source/parser_i/idl/pe_vari2.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 @@ -47,9 +47,9 @@ namespace uidl { -PE_Variable::PE_Variable( ary::idl::Type_id & i_rResult_Type, - String & i_rResult_Name ) - : eState(e_none), +PE_Variable::PE_Variable( ary::idl::Type_id & i_rResult_Type, + String & i_rResult_Name ) + : eState(e_none), pResult_Type(&i_rResult_Type), pResult_Name(&i_rResult_Name), pPE_Type(0) @@ -58,9 +58,9 @@ PE_Variable::PE_Variable( ary::idl::Type_id & i_rResult_Type, } void -PE_Variable::EstablishContacts( UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, - TokenProcessing_Result & o_rResult ) +PE_Variable::EstablishContacts( UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, + TokenProcessing_Result & o_rResult ) { UnoIDL_PE::EstablishContacts(io_pParentPE,io_rRepository,o_rResult); pPE_Type->EstablishContacts(this,io_rRepository,o_rResult); @@ -84,7 +84,7 @@ PE_Variable::Process_Default() { SetResult( not_done, push_sure, pPE_Type.Ptr() ); } - else{ + else{ csv_assert(false); } } diff --git a/autodoc/source/parser_i/idl/pestate.cxx b/autodoc/source/parser_i/idl/pestate.cxx index 2799e2029783..214be8e9a958 100644 --- a/autodoc/source/parser_i/idl/pestate.cxx +++ b/autodoc/source/parser_i/idl/pestate.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 @@ -73,7 +73,7 @@ ParseEnvState::Process_TypeModifier( const TokTypeModifier & ) } void -ParseEnvState::Process_MetaType( const TokMetaType & ) +ParseEnvState::Process_MetaType( const TokMetaType & ) { Process_Default(); } @@ -131,7 +131,7 @@ ParseEnvState::Process_Default() { if (bDefaultIsError) MyPE().SetResult(not_done, pop_failure); - else // ignore: + else // ignore: MyPE().SetResult(done, stay); } diff --git a/autodoc/source/parser_i/idl/semnode.cxx b/autodoc/source/parser_i/idl/semnode.cxx index f2e38a291e87..4ff1e3f191fd 100644 --- a/autodoc/source/parser_i/idl/semnode.cxx +++ b/autodoc/source/parser_i/idl/semnode.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 @@ -46,19 +46,19 @@ namespace uidl SemanticNode::SemanticNode() - : pParentPE(0), + : pParentPE(0), pAryGate(0), pTokenResult(0) { } void -SemanticNode::EstablishContacts( UnoIDL_PE * io_pParentPE, +SemanticNode::EstablishContacts( UnoIDL_PE * io_pParentPE, ary::idl::Gate & io_rGate, - TokenProcessing_Result & o_rResult ) + TokenProcessing_Result & o_rResult ) { - pParentPE = io_pParentPE; - pAryGate = &io_rGate; + pParentPE = io_pParentPE; + pAryGate = &io_rGate; pTokenResult = &o_rResult; } @@ -67,15 +67,15 @@ SemanticNode::~SemanticNode() } void -SemanticNode::SetTokenResult( E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push ) +SemanticNode::SetTokenResult( E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push ) { csv_assert(pTokenResult != 0); - pTokenResult->eDone = i_eDone; - pTokenResult->eStackAction = i_eWhat2DoWithEnvStack; - pTokenResult->pEnv2Push = i_pParseEnv2Push; + pTokenResult->eDone = i_eDone; + pTokenResult->eStackAction = i_eWhat2DoWithEnvStack; + pTokenResult->pEnv2Push = i_pParseEnv2Push; } diff --git a/autodoc/source/parser_i/idl/tk_const.cxx b/autodoc/source/parser_i/idl/tk_const.cxx index 98b418b3f679..69027f73dc06 100644 --- a/autodoc/source/parser_i/idl/tk_const.cxx +++ b/autodoc/source/parser_i/idl/tk_const.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 @@ -42,7 +42,7 @@ namespace uidl void -TokAssignment::Trigger( TokenInterpreter & io_rInterpreter ) const +TokAssignment::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Assignment(*this); } diff --git a/autodoc/source/parser_i/idl/tk_ident.cxx b/autodoc/source/parser_i/idl/tk_ident.cxx index 13f5571d5e05..bda977da6085 100644 --- a/autodoc/source/parser_i/idl/tk_ident.cxx +++ b/autodoc/source/parser_i/idl/tk_ident.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 @@ -41,7 +41,7 @@ namespace uidl { void -TokIdentifier::Trigger( TokenInterpreter & io_rInterpreter ) const +TokIdentifier::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Identifier(*this); } @@ -53,7 +53,7 @@ TokIdentifier::Text() const } void -TokNameSeparator::Trigger( TokenInterpreter & io_rInterpreter ) const +TokNameSeparator::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_NameSeparator(); } diff --git a/autodoc/source/parser_i/idl/tk_keyw.cxx b/autodoc/source/parser_i/idl/tk_keyw.cxx index 408f83dc4b58..7b3332705821 100644 --- a/autodoc/source/parser_i/idl/tk_keyw.cxx +++ b/autodoc/source/parser_i/idl/tk_keyw.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 @@ -41,7 +41,7 @@ using csi::uidl::TokStereotype; using csi::uidl::TokParameterHandling; -lux::EnumValueMap G_aTokBuiltInType_EV_TokenId_Values; +lux::EnumValueMap G_aTokBuiltInType_EV_TokenId_Values; TokBuiltInType::EV_TokenId ev_bty_none(TokBuiltInType::e_none,""); TokBuiltInType::EV_TokenId ev_bty_any(TokBuiltInType::bty_any,"any"); TokBuiltInType::EV_TokenId ev_bty_boolean(TokBuiltInType::bty_boolean,"boolean"); @@ -56,30 +56,30 @@ TokBuiltInType::EV_TokenId ev_bty_void(TokBuiltInType::bty_void,"void"); TokBuiltInType::EV_TokenId ev_bty_ellipse(TokBuiltInType::bty_ellipse,"..."); -lux::EnumValueMap G_aTokTypeModifier_EV_TokenId_Values; +lux::EnumValueMap G_aTokTypeModifier_EV_TokenId_Values; TokTypeModifier::EV_TokenId ev_tmod_none(TokTypeModifier::e_none,""); TokTypeModifier::EV_TokenId ev_tmod_unsigned(TokTypeModifier::tmod_unsigned,"unsigned"); TokTypeModifier::EV_TokenId ev_tmod_sequence(TokTypeModifier::tmod_sequence,"sequence"); -lux::EnumValueMap G_aTokMetaType_EV_TokenId_Values; +lux::EnumValueMap G_aTokMetaType_EV_TokenId_Values; TokMetaType::EV_TokenId ev_mt_none(TokMetaType::e_none,""); -TokMetaType::EV_TokenId ev_mt_attribute(TokMetaType::mt_attribute,"attribute"); -TokMetaType::EV_TokenId ev_mt_constants(TokMetaType::mt_constants,"constants"); -TokMetaType::EV_TokenId ev_mt_enum(TokMetaType::mt_enum,"enum"); -TokMetaType::EV_TokenId ev_mt_exception(TokMetaType::mt_exception,"exception"); -TokMetaType::EV_TokenId ev_mt_ident(TokMetaType::mt_ident,"ident"); -TokMetaType::EV_TokenId ev_mt_interface(TokMetaType::mt_interface,"interface"); -TokMetaType::EV_TokenId ev_mt_module(TokMetaType::mt_module,"module"); -TokMetaType::EV_TokenId ev_mt_property(TokMetaType::mt_property,"property"); -TokMetaType::EV_TokenId ev_mt_service(TokMetaType::mt_service,"service"); -TokMetaType::EV_TokenId ev_mt_singleton(TokMetaType::mt_singleton,"singleton"); -TokMetaType::EV_TokenId ev_mt_struct(TokMetaType::mt_struct,"struct"); -TokMetaType::EV_TokenId ev_mt_typedef(TokMetaType::mt_typedef,"typedef"); -TokMetaType::EV_TokenId ev_mt_uik(TokMetaType::mt_uik,"uik"); - - -lux::EnumValueMap G_aTokStereotype_EV_TokenId_Values; +TokMetaType::EV_TokenId ev_mt_attribute(TokMetaType::mt_attribute,"attribute"); +TokMetaType::EV_TokenId ev_mt_constants(TokMetaType::mt_constants,"constants"); +TokMetaType::EV_TokenId ev_mt_enum(TokMetaType::mt_enum,"enum"); +TokMetaType::EV_TokenId ev_mt_exception(TokMetaType::mt_exception,"exception"); +TokMetaType::EV_TokenId ev_mt_ident(TokMetaType::mt_ident,"ident"); +TokMetaType::EV_TokenId ev_mt_interface(TokMetaType::mt_interface,"interface"); +TokMetaType::EV_TokenId ev_mt_module(TokMetaType::mt_module,"module"); +TokMetaType::EV_TokenId ev_mt_property(TokMetaType::mt_property,"property"); +TokMetaType::EV_TokenId ev_mt_service(TokMetaType::mt_service,"service"); +TokMetaType::EV_TokenId ev_mt_singleton(TokMetaType::mt_singleton,"singleton"); +TokMetaType::EV_TokenId ev_mt_struct(TokMetaType::mt_struct,"struct"); +TokMetaType::EV_TokenId ev_mt_typedef(TokMetaType::mt_typedef,"typedef"); +TokMetaType::EV_TokenId ev_mt_uik(TokMetaType::mt_uik,"uik"); + + +lux::EnumValueMap G_aTokStereotype_EV_TokenId_Values; TokStereotype::EV_TokenId ev_ste_none(TokStereotype::e_none,""); TokStereotype::EV_TokenId ev_ste_bound(TokStereotype::ste_bound,"bound"); TokStereotype::EV_TokenId ev_ste_const(TokStereotype::ste_const,"const"); @@ -96,26 +96,26 @@ TokStereotype::EV_TokenId ev_ste_transient(TokStereotype::ste_transient,"trans TokStereotype::EV_TokenId ev_ste_published(TokStereotype::ste_published,"published"); -lux::EnumValueMap G_aTokParameterHandling_EV_TokenId_Values; +lux::EnumValueMap G_aTokParameterHandling_EV_TokenId_Values; TokParameterHandling::EV_TokenId ev_ph_none(TokParameterHandling::e_none,""); -TokParameterHandling::EV_TokenId ev_ph_in(TokParameterHandling::ph_in,"in"); -TokParameterHandling::EV_TokenId ev_ph_out(TokParameterHandling::ph_out,"out"); -TokParameterHandling::EV_TokenId ev_ph_inout(TokParameterHandling::ph_inout,"inout"); +TokParameterHandling::EV_TokenId ev_ph_in(TokParameterHandling::ph_in,"in"); +TokParameterHandling::EV_TokenId ev_ph_out(TokParameterHandling::ph_out,"out"); +TokParameterHandling::EV_TokenId ev_ph_inout(TokParameterHandling::ph_inout,"inout"); namespace lux { template<> EnumValueMap & -TokBuiltInType::EV_TokenId::Values_() { return G_aTokBuiltInType_EV_TokenId_Values; } +TokBuiltInType::EV_TokenId::Values_() { return G_aTokBuiltInType_EV_TokenId_Values; } template<> EnumValueMap & -TokTypeModifier::EV_TokenId::Values_() { return G_aTokTypeModifier_EV_TokenId_Values; } +TokTypeModifier::EV_TokenId::Values_() { return G_aTokTypeModifier_EV_TokenId_Values; } template<> EnumValueMap & -TokMetaType::EV_TokenId::Values_() { return G_aTokMetaType_EV_TokenId_Values; } +TokMetaType::EV_TokenId::Values_() { return G_aTokMetaType_EV_TokenId_Values; } template<> EnumValueMap & -TokStereotype::EV_TokenId::Values_() { return G_aTokStereotype_EV_TokenId_Values; } +TokStereotype::EV_TokenId::Values_() { return G_aTokStereotype_EV_TokenId_Values; } template<> EnumValueMap & -TokParameterHandling::EV_TokenId::Values_() { return G_aTokParameterHandling_EV_TokenId_Values; } +TokParameterHandling::EV_TokenId::Values_() { return G_aTokParameterHandling_EV_TokenId_Values; } } // namespace lux @@ -127,7 +127,7 @@ namespace uidl { void -TokBuiltInType::Trigger( TokenInterpreter & io_rInterpreter ) const +TokBuiltInType::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_BuiltInType(*this); } @@ -139,7 +139,7 @@ TokBuiltInType::Text() const } void -TokTypeModifier::Trigger( TokenInterpreter & io_rInterpreter ) const +TokTypeModifier::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_TypeModifier(*this); } @@ -151,7 +151,7 @@ TokTypeModifier::Text() const } void -TokMetaType::Trigger( TokenInterpreter & io_rInterpreter ) const +TokMetaType::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_MetaType(*this); } @@ -163,7 +163,7 @@ TokMetaType::Text() const } void -TokStereotype::Trigger( TokenInterpreter & io_rInterpreter ) const +TokStereotype::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Stereotype(*this); } @@ -175,7 +175,7 @@ TokStereotype::Text() const } void -TokParameterHandling::Trigger( TokenInterpreter & io_rInterpreter ) const +TokParameterHandling::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_ParameterHandling(*this); } @@ -187,7 +187,7 @@ TokParameterHandling::Text() const } void -TokRaises::Trigger( TokenInterpreter & io_rInterpreter ) const +TokRaises::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Raises(); } @@ -199,7 +199,7 @@ TokRaises::Text() const } void -TokNeeds::Trigger( TokenInterpreter & io_rInterpreter ) const +TokNeeds::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Needs(); } @@ -210,7 +210,7 @@ TokNeeds::Text() const return "needs"; } void -TokObserves::Trigger( TokenInterpreter & io_rInterpreter ) const +TokObserves::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Observes(); } diff --git a/autodoc/source/parser_i/idl/tk_punct.cxx b/autodoc/source/parser_i/idl/tk_punct.cxx index e617473fcd1b..970fc2ebce80 100644 --- a/autodoc/source/parser_i/idl/tk_punct.cxx +++ b/autodoc/source/parser_i/idl/tk_punct.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 @@ -38,7 +38,7 @@ using csi::uidl::TokPunctuation; -lux::EnumValueMap G_aTokPunctuation_EV_TokenId_Values; +lux::EnumValueMap G_aTokPunctuation_EV_TokenId_Values; TokPunctuation::EV_TokenId ev_none(TokPunctuation::e_none,""); TokPunctuation::EV_TokenId BracketOpen(TokPunctuation::BracketOpen,"("); TokPunctuation::EV_TokenId BracketClose(TokPunctuation::BracketClose,")"); @@ -61,7 +61,7 @@ TokPunctuation::EV_TokenId Greater(TokPunctuation::Greater,">"); namespace lux { template<> EnumValueMap & -TokPunctuation::EV_TokenId::Values_() { return G_aTokPunctuation_EV_TokenId_Values; } +TokPunctuation::EV_TokenId::Values_() { return G_aTokPunctuation_EV_TokenId_Values; } } @@ -73,7 +73,7 @@ namespace uidl { void -TokPunctuation::Trigger( TokenInterpreter & io_rInterpreter ) const +TokPunctuation::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Punctuation(*this); } @@ -85,7 +85,7 @@ TokPunctuation::Text() const } void -Tok_EOL::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_EOL::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_EOL(); } @@ -100,7 +100,7 @@ void Tok_EOF::Trigger( TokenInterpreter & ) const { csv_assert(false); -// io_rInterpreter.Process_EOF(); +// io_rInterpreter.Process_EOF(); } const char * diff --git a/autodoc/source/parser_i/idl/tkp_uidl.cxx b/autodoc/source/parser_i/idl/tkp_uidl.cxx index 66f8c556cdbf..2f6d944e4beb 100644 --- a/autodoc/source/parser_i/idl/tkp_uidl.cxx +++ b/autodoc/source/parser_i/idl/tkp_uidl.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 @@ -40,9 +40,9 @@ namespace uidl { -TokenParser_Uidl::TokenParser_Uidl( Token_Receiver & o_rUidlReceiver, - DYN ::TkpDocuContext & let_drDocuContext ) - : pBaseContext(new Context_UidlCode(o_rUidlReceiver, let_drDocuContext)), +TokenParser_Uidl::TokenParser_Uidl( Token_Receiver & o_rUidlReceiver, + DYN ::TkpDocuContext & let_drDocuContext ) + : pBaseContext(new Context_UidlCode(o_rUidlReceiver, let_drDocuContext)), pCurContext(0) { SetStartContext(); diff --git a/autodoc/source/parser_i/idl/unoidl.cxx b/autodoc/source/parser_i/idl/unoidl.cxx index 5206a364d78e..b746b89baf1d 100644 --- a/autodoc/source/parser_i/idl/unoidl.cxx +++ b/autodoc/source/parser_i/idl/unoidl.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 @@ -61,13 +61,13 @@ class FileParsePerformers io_rRepository, ParserInfo & io_rParserInfo ); - void ParseFile( - const char * i_sFullPath ); + void ParseFile( + const char * i_sFullPath ); void ConnectLinks(); private: - CharacterSource aFileLoader; + CharacterSource aFileLoader; Dyn<csi::uidl::TokenParser_Uidl> pTokens; csi::uidl::TokenDistributor @@ -81,7 +81,7 @@ class FileParsePerformers IdlParser::IdlParser( ary::Repository & io_rRepository ) - : pRepository(&io_rRepository) + : pRepository(&io_rRepository) { } @@ -123,7 +123,7 @@ IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles ) { Cout() << "Unknown error." << Endl(); exit(0); -// pFileParsePerformers = new FileParsePerformers( *pRepository ); +// pFileParsePerformers = new FileParsePerformers( *pRepository ); } } @@ -131,7 +131,7 @@ IdlParser::Run( const autodoc::FileCollector_Ifc & i_rFiles ) } FileParsePerformers::FileParsePerformers( ary::Repository & io_rRepository, - ParserInfo & io_rParserInfo ) + ParserInfo & io_rParserInfo ) : pTokens(0), aDistributor(io_rRepository, io_rParserInfo), rRepository( io_rRepository ), diff --git a/autodoc/source/parser_i/idoc/cx_docu2.cxx b/autodoc/source/parser_i/idoc/cx_docu2.cxx index c39a1aa0f49a..a0418cbadc87 100644 --- a/autodoc/source/parser_i/idoc/cx_docu2.cxx +++ b/autodoc/source/parser_i/idoc/cx_docu2.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 @@ -107,8 +107,8 @@ Cx_EoXmlConst::ReadCharChain( CharacterSource & io_rText ) void Cx_EoXmlLink_BeginTag::ReadCharChain( CharacterSource & io_rText ) { - String sScope; - String sDim; + String sScope; + String sDim; do { char cReached = jumpTo(io_rText,'"','>','*'); @@ -169,7 +169,7 @@ Cx_EoXmlLink_EndTag::ReadCharChain( CharacterSource & io_rText ) void Cx_EoXmlFormat_BeginTag::ReadCharChain( CharacterSource & io_rText ) { - String sDim; + String sDim; char cReached = jumpTo(io_rText,'"','>','*'); switch (cReached) diff --git a/autodoc/source/parser_i/idoc/cx_dsapi.cxx b/autodoc/source/parser_i/idoc/cx_dsapi.cxx index b1cf5fddcc63..ade06fd48164 100644 --- a/autodoc/source/parser_i/idoc/cx_dsapi.cxx +++ b/autodoc/source/parser_i/idoc/cx_dsapi.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 @@ -108,7 +108,7 @@ const UINT16 nTok_EOL = 502; Context_Docu::Context_Docu( Token_Receiver & o_rReceiver ) - : aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati), + : aStateMachine(C_nStatusSize, C_nCppInitialNrOfStati), pReceiver(&o_rReceiver), pParentContext(0), pCx_EoHtml(0), @@ -156,7 +156,7 @@ Context_Docu::ReadCharChain( CharacterSource & io_rText ) StmBoundsStatu2 & rBound = aStateMachine.GetCharChain(nTokenId, io_rText); // !!! - // The order of the next two lines is essential, because + // The order of the next two lines is essential, because // pFollowUpContext may be changed by PerformStatusFunction() also, // which then MUST override the previous assignment. pFollowUpContext = rBound.FollowUpContext(); @@ -182,9 +182,9 @@ Context_Docu::FollowUpContext() } void -Context_Docu::PerformStatusFunction( uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ) +Context_Docu::PerformStatusFunction( uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ) { switch (i_nStatusSignal) { @@ -273,34 +273,34 @@ Context_Docu::PerformStatusFunction( uintt i_nStatusSignal, break; default: csv_assert(false); - } // end switch (i_nStatusSignal) + } // end switch (i_nStatusSignal) } void Context_Docu::SetupStateMachine() { // Besondere Array-Stati (kein Tokenabschluss oder Kontextwechsel): -// const INT16 bas = 0; // Base-Status - const INT16 wht = 1; // Whitespace-overlook-Status - const INT16 awd = 2; // Any-Word-Read-Status +// const INT16 bas = 0; // Base-Status + const INT16 wht = 1; // Whitespace-overlook-Status + const INT16 awd = 2; // Any-Word-Read-Status // Kontextwechsel-Stati: - const INT16 goto_EoHtml = 3; - const INT16 goto_EoXmlConst = 4; - const INT16 goto_EoXmlLink_BeginTag = 5; - const INT16 goto_EoXmlLink_EndTag = 6; - const INT16 goto_EoXmlFormat_BeginTag = 7; - const INT16 goto_EoXmlFormat_EndTag = 8; - const INT16 goto_CheckStar = 9; + const INT16 goto_EoHtml = 3; + const INT16 goto_EoXmlConst = 4; + const INT16 goto_EoXmlLink_BeginTag = 5; + const INT16 goto_EoXmlLink_EndTag = 6; + const INT16 goto_EoXmlFormat_BeginTag = 7; + const INT16 goto_EoXmlFormat_EndTag = 8; + const INT16 goto_CheckStar = 9; // Tokenfinish-Stati: const INT16 finError = 10; -// const INT16 finIgnore = 11; +// const INT16 finIgnore = 11; const INT16 finEof = 12; const INT16 finAnyWord = 13; const INT16 finAtTag = 14; const INT16 finEndSign = 15; -// const INT16 finComma = 16; +// const INT16 finComma = 16; const INT16 finWhite = 17; // Konstanten zur Benutzung in der Tabelle: @@ -314,16 +314,16 @@ Context_Docu::SetupStateMachine() */ const INT16 err = finError; const INT16 faw = finAnyWord; -// const INT16 fig = finIgnore; -// const INT16 fes = finEndSign; +// const INT16 fig = finIgnore; +// const INT16 fes = finEndSign; const INT16 fof = finEof; -// const INT16 fat = finAtTag; +// const INT16 fat = finAtTag; const INT16 fwh = finWhite; /// The '0's will be replaced by calls of AddToken(). const INT16 A_nTopStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {fof,err,err,err,err,err,err,err,err,wht, 0,wht,wht, 0,err,err, err,err,err,err,err,err,err,err,err,err,fof,err,err,err,err,err, // ... 31 wht,awd,awd,awd,awd,awd,awd,awd,awd,awd, 0,awd,awd,awd,awd,awd, @@ -347,7 +347,7 @@ Context_Docu::SetupStateMachine() }; const INT16 A_nWordStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err, err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31 faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd, @@ -359,7 +359,7 @@ Context_Docu::SetupStateMachine() }; const INT16 A_nAtTagDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {faw,err,err,err,err,err,err,err,err,faw,faw,faw,faw,faw,err,err, err,err,err,err,err,err,err,err,err,err,faw,err,err,err,err,err, // ... 31 faw,awd,awd,awd,awd,awd,awd,awd,awd,awd,faw,awd,awd,awd,awd,awd, @@ -371,7 +371,7 @@ Context_Docu::SetupStateMachine() }; const INT16 A_nHtmlDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {ght,err,err,err,err,err,err,err,err,ght,ght,ght,ght,ght,err,err, err,err,err,err,err,err,err,err,err,err,ght,err,err,err,err,err, // ... 31 ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght,ght, @@ -383,7 +383,7 @@ Context_Docu::SetupStateMachine() }; const INT16 A_nPunctDefStatus[C_nStatusSize] = - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 {err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, // 16 ... err,err,err,err,err,err,err,err,err,err,err,err,err,err,err,err, @@ -401,37 +401,37 @@ Context_Docu::SetupStateMachine() DYN StmArrayStatu2 * dpStatusWord = new StmArrayStatu2( C_nStatusSize, A_nWordStatus, 0, true); - DYN StmBoundsStatu2 * dpBst_goto_EoHtml + DYN StmBoundsStatu2 * dpBst_goto_EoHtml = new StmBoundsStatu2( *this, *pCx_EoHtml, nF_goto_EoHtml, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlConst + DYN StmBoundsStatu2 * dpBst_goto_EoXmlConst = new StmBoundsStatu2( *this, *pCx_EoXmlConst, nF_goto_EoXmlConst, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_BeginTag + DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_BeginTag = new StmBoundsStatu2( *this, *pCx_EoXmlLink_BeginTag, nF_goto_EoXmlLink_BeginTag, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_EndTag + DYN StmBoundsStatu2 * dpBst_goto_EoXmlLink_EndTag = new StmBoundsStatu2( *this, *pCx_EoXmlLink_EndTag, nF_goto_EoXmlLink_EndTag, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_BeginTag + DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_BeginTag = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_BeginTag, nF_goto_EoXmlFormat_BeginTag, true ); - DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_EndTag + DYN StmBoundsStatu2 * dpBst_goto_EoXmlFormat_EndTag = new StmBoundsStatu2( *this, *pCx_EoXmlFormat_EndTag, nF_goto_EoXmlFormat_EndTag, true ); - DYN StmBoundsStatu2 * dpBst_goto_CheckStar + DYN StmBoundsStatu2 * dpBst_goto_CheckStar = new StmBoundsStatu2( *this, *pCx_CheckStar, nF_goto_CheckStar, true ); - DYN StmBoundsStatu2 * dpBst_finError + DYN StmBoundsStatu2 * dpBst_finError = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Error, true ); - DYN StmBoundsStatu2 * dpBst_finIgnore + DYN StmBoundsStatu2 * dpBst_finIgnore = new StmBoundsStatu2( *this, *this, nF_fin_Ignore, true); - DYN StmBoundsStatu2 * dpBst_finEof + DYN StmBoundsStatu2 * dpBst_finEof = new StmBoundsStatu2( *this, TkpContext_Null2_(), nF_fin_Eof, false); - DYN StmBoundsStatu2 * dpBst_finAnyWord + DYN StmBoundsStatu2 * dpBst_finAnyWord = new StmBoundsStatu2( *this, *this, nF_fin_AnyWord, true); - DYN StmBoundsStatu2 * dpBst_finAtTag + DYN StmBoundsStatu2 * dpBst_finAtTag = new StmBoundsStatu2( *this, *this, nF_fin_AtTag, false); - DYN StmBoundsStatu2 * dpBst_finEndSign + DYN StmBoundsStatu2 * dpBst_finEndSign = new StmBoundsStatu2( *this, *pParentContext, nF_fin_EndSign, false); - DYN StmBoundsStatu2 * dpBst_fin_Comma + DYN StmBoundsStatu2 * dpBst_fin_Comma = new StmBoundsStatu2( *this, *this, nF_fin_Comma, false ); - DYN StmBoundsStatu2 * dpBst_finWhite + DYN StmBoundsStatu2 * dpBst_finWhite = new StmBoundsStatu2( *this, *this, nF_fin_White, false); @@ -458,7 +458,7 @@ Context_Docu::SetupStateMachine() aStateMachine.AddStatus(dpBst_finWhite); - aStateMachine.AddToken( "@author", nTok_at_author, A_nAtTagDefStatus, finAtTag ); + aStateMachine.AddToken( "@author", nTok_at_author, A_nAtTagDefStatus, finAtTag ); aStateMachine.AddToken( "@param", nTok_at_param, A_nAtTagDefStatus, finAtTag ); aStateMachine.AddToken( "@throws", nTok_at_throws, A_nAtTagDefStatus, finAtTag ); aStateMachine.AddToken( "@see", nTok_at_see, A_nAtTagDefStatus, finAtTag ); @@ -481,31 +481,31 @@ Context_Docu::SetupStateMachine() aStateMachine.AddToken( "<", 0, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "*", 0, A_nPunctDefStatus, goto_CheckStar ); -// aStateMachine.AddToken( ",", 0, A_nPunctDefStatus, finComma ); +// aStateMachine.AddToken( ",", 0, A_nPunctDefStatus, finComma ); aStateMachine.AddToken( "<type", nTok_link_typeB, A_nHtmlDefStatus, goto_EoXmlLink_BeginTag ); aStateMachine.AddToken( "</type", nTok_link_typeE, A_nHtmlDefStatus, goto_EoXmlLink_EndTag ); aStateMachine.AddToken( "<member", nTok_link_memberB, A_nHtmlDefStatus, goto_EoXmlLink_BeginTag ); aStateMachine.AddToken( "</member", nTok_link_membeE, A_nHtmlDefStatus, goto_EoXmlLink_EndTag ); aStateMachine.AddToken( "<const", nTok_link_constB, A_nHtmlDefStatus, goto_EoXmlLink_BeginTag ); - aStateMachine.AddToken( "</const", nTok_link_constE, A_nHtmlDefStatus, goto_EoXmlLink_EndTag ); + aStateMachine.AddToken( "</const", nTok_link_constE, A_nHtmlDefStatus, goto_EoXmlLink_EndTag ); - aStateMachine.AddToken( "<listing", nTok_format_listingB,A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); + aStateMachine.AddToken( "<listing", nTok_format_listingB,A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); aStateMachine.AddToken( "</listing",nTok_format_listingE,A_nHtmlDefStatus, goto_EoXmlFormat_EndTag ); - aStateMachine.AddToken( "<code", nTok_format_codeB, A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); + aStateMachine.AddToken( "<code", nTok_format_codeB, A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); aStateMachine.AddToken( "</code", nTok_format_codeE, A_nHtmlDefStatus, goto_EoXmlFormat_EndTag ); - aStateMachine.AddToken( "<atom", nTok_format_atomB, A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); + aStateMachine.AddToken( "<atom", nTok_format_atomB, A_nHtmlDefStatus, goto_EoXmlFormat_BeginTag ); aStateMachine.AddToken( "</atom", nTok_format_atomE, A_nHtmlDefStatus, goto_EoXmlFormat_EndTag ); - aStateMachine.AddToken( "<TRUE/", nTok_const_TRUE, A_nHtmlDefStatus, goto_EoXmlConst ); - aStateMachine.AddToken( "<true/", nTok_const_TRUE, A_nHtmlDefStatus, goto_EoXmlConst ); - aStateMachine.AddToken( "<FALSE/", nTok_const_FALSE, A_nHtmlDefStatus, goto_EoXmlConst ); - aStateMachine.AddToken( "<false/", nTok_const_FALSE, A_nHtmlDefStatus, goto_EoXmlConst ); + aStateMachine.AddToken( "<TRUE/", nTok_const_TRUE, A_nHtmlDefStatus, goto_EoXmlConst ); + aStateMachine.AddToken( "<true/", nTok_const_TRUE, A_nHtmlDefStatus, goto_EoXmlConst ); + aStateMachine.AddToken( "<FALSE/", nTok_const_FALSE, A_nHtmlDefStatus, goto_EoXmlConst ); + aStateMachine.AddToken( "<false/", nTok_const_FALSE, A_nHtmlDefStatus, goto_EoXmlConst ); aStateMachine.AddToken( "<NULL/", nTok_const_NULL, A_nHtmlDefStatus, goto_EoXmlConst ); aStateMachine.AddToken( "<void/", nTok_const_void, A_nHtmlDefStatus, goto_EoXmlConst ); - aStateMachine.AddToken( "<p", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); - aStateMachine.AddToken( "<pre", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); + aStateMachine.AddToken( "<p", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); + aStateMachine.AddToken( "<pre", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "<dl", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "<ul", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "<ol", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); @@ -517,13 +517,13 @@ Context_Docu::SetupStateMachine() aStateMachine.AddToken( "<OL", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); aStateMachine.AddToken( "<TABLE", nTok_html_parastart, A_nHtmlDefStatus, goto_EoHtml ); - aStateMachine.AddToken( "\r\n", nTok_EOL, A_nPunctDefStatus, finEndSign ); - aStateMachine.AddToken( "\n", nTok_EOL, A_nPunctDefStatus, finEndSign ); - aStateMachine.AddToken( "\r", nTok_EOL, A_nPunctDefStatus, finEndSign ); + aStateMachine.AddToken( "\r\n", nTok_EOL, A_nPunctDefStatus, finEndSign ); + aStateMachine.AddToken( "\n", nTok_EOL, A_nPunctDefStatus, finEndSign ); + aStateMachine.AddToken( "\r", nTok_EOL, A_nPunctDefStatus, finEndSign ); }; void -Context_Docu::SetMode_IsMultiLine( bool i_bTrue ) +Context_Docu::SetMode_IsMultiLine( bool i_bTrue ) { bIsMultiline = i_bTrue; } diff --git a/autodoc/source/parser_i/idoc/docu_pe2.cxx b/autodoc/source/parser_i/idoc/docu_pe2.cxx index 3c8efce59a90..6b807a57bd95 100644 --- a/autodoc/source/parser_i/idoc/docu_pe2.cxx +++ b/autodoc/source/parser_i/idoc/docu_pe2.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 @@ -55,12 +55,12 @@ namespace dsapi { -const char * AtTagTitle( - const Tok_AtTag & i_rToken ); +const char * AtTagTitle( + const Tok_AtTag & i_rToken ); SapiDocu_PE::SapiDocu_PE(ParserInfo & io_rPositionInfo) - : pDocu(0), + : pDocu(0), eState(e_none), pPositionInfo(&io_rPositionInfo), fCurTokenAddFunction(&SapiDocu_PE::AddDocuToken2Void), @@ -97,7 +97,7 @@ SapiDocu_PE::ProcessToken( DYN csi::dsapi::Token & let_drToken ) } void -SapiDocu_PE::Process_AtTag( const Tok_AtTag & i_rToken ) +SapiDocu_PE::Process_AtTag( const Tok_AtTag & i_rToken ) { if (NOT pCurAtTag) { @@ -294,7 +294,7 @@ SapiDocu_PE::Process_XmlFormat_EndTag( const Tok_XmlFormat_EndTag & i_rToken ) } void -SapiDocu_PE::Process_Word( const Tok_Word & i_rToken ) +SapiDocu_PE::Process_Word( const Tok_Word & i_rToken ) { (this->*fCurTokenAddFunction)(*new DT_TextToken(i_rToken.Text())); } @@ -303,7 +303,7 @@ void SapiDocu_PE::Process_Comma() { csv_assert(1==7); -// (this->*fCurTokenAddFunction)(*new DT_Comma(i_rToken.Text())); +// (this->*fCurTokenAddFunction)(*new DT_Comma(i_rToken.Text())); } void @@ -485,12 +485,12 @@ SapiDocu_PE::SetCurSeeAlsoAtTagLinkText_3( DYN ary::inf::DocuToken & let_drNewTo } /// Could emit warning, but don't because this parser is obsolete. -// Tok_XmlLink_BeginTag * -// pLinkEnd = dynamic_cast< Tok_XmlLink_EndTag* >(&let_drNewToken); -// if (pLinkEnd == 0) -// { -// warn_aboutMissingClosingTag(); -// } +// Tok_XmlLink_BeginTag * +// pLinkEnd = dynamic_cast< Tok_XmlLink_EndTag* >(&let_drNewToken); +// if (pLinkEnd == 0) +// { +// warn_aboutMissingClosingTag(); +// } delete &let_drNewToken; fCurTokenAddFunction = &SapiDocu_PE::AddDocuToken2CurAtTag; @@ -579,20 +579,20 @@ AtTagTitle( const Tok_AtTag & i_rToken ) { switch (i_rToken.Id()) { - case Tok_AtTag::author: return ""; - case Tok_AtTag::see: return "See also"; - case Tok_AtTag::param: return "Parameters"; - case Tok_AtTag::e_return: return "Returns"; - case Tok_AtTag::e_throw: return "Throws"; - case Tok_AtTag::example: return "Example"; - case Tok_AtTag::deprecated: return "Deprecated"; - case Tok_AtTag::suspicious: return ""; - case Tok_AtTag::missing: return ""; - case Tok_AtTag::incomplete: return ""; - case Tok_AtTag::version: return ""; - case Tok_AtTag::guarantees: return "Guarantees"; - case Tok_AtTag::exception: return "Exception"; - case Tok_AtTag::since: return "Since version"; + case Tok_AtTag::author: return ""; + case Tok_AtTag::see: return "See also"; + case Tok_AtTag::param: return "Parameters"; + case Tok_AtTag::e_return: return "Returns"; + case Tok_AtTag::e_throw: return "Throws"; + case Tok_AtTag::example: return "Example"; + case Tok_AtTag::deprecated: return "Deprecated"; + case Tok_AtTag::suspicious: return ""; + case Tok_AtTag::missing: return ""; + case Tok_AtTag::incomplete: return ""; + case Tok_AtTag::version: return ""; + case Tok_AtTag::guarantees: return "Guarantees"; + case Tok_AtTag::exception: return "Exception"; + case Tok_AtTag::since: return "Since version"; default: // See below. ; diff --git a/autodoc/source/parser_i/idoc/tk_atag2.cxx b/autodoc/source/parser_i/idoc/tk_atag2.cxx index 30264f68f1f0..1b4baddab098 100644 --- a/autodoc/source/parser_i/idoc/tk_atag2.cxx +++ b/autodoc/source/parser_i/idoc/tk_atag2.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 @@ -37,7 +37,7 @@ using csi::dsapi::Tok_AtTag; -lux::EnumValueMap G_aTokAtTag_EV_TokenId_Values; +lux::EnumValueMap G_aTokAtTag_EV_TokenId_Values; Tok_AtTag::EV_TokenId ev_none2(Tok_AtTag::e_none,""); Tok_AtTag::EV_TokenId ev_author(Tok_AtTag::author,"@author"); Tok_AtTag::EV_TokenId ev_see(Tok_AtTag::see,"@see"); @@ -58,7 +58,7 @@ Tok_AtTag::EV_TokenId ev_since(Tok_AtTag::since,"@since"); namespace lux { template<> EnumValueMap & -Tok_AtTag::EV_TokenId::Values_() { return G_aTokAtTag_EV_TokenId_Values; } +Tok_AtTag::EV_TokenId::Values_() { return G_aTokAtTag_EV_TokenId_Values; } } @@ -68,7 +68,7 @@ namespace dsapi { void -Tok_AtTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_AtTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_AtTag(*this); } diff --git a/autodoc/source/parser_i/idoc/tk_docw2.cxx b/autodoc/source/parser_i/idoc/tk_docw2.cxx index 097214a9c838..1243ae8c3ebb 100644 --- a/autodoc/source/parser_i/idoc/tk_docw2.cxx +++ b/autodoc/source/parser_i/idoc/tk_docw2.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 @@ -41,7 +41,7 @@ namespace dsapi { void -Tok_Word::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_Word::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Word(*this); } @@ -53,7 +53,7 @@ Tok_Word::Text() const } void -Tok_Comma::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_Comma::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_Comma(); } @@ -65,7 +65,7 @@ Tok_Comma::Text() const } void -Tok_DocuEnd::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_DocuEnd::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_DocuEnd(); } @@ -77,7 +77,7 @@ Tok_DocuEnd::Text() const } void -Tok_EOL::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_EOL::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_EOL(); } @@ -101,7 +101,7 @@ Tok_EOF::Text() const } void -Tok_White::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_White::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_White(); } diff --git a/autodoc/source/parser_i/idoc/tk_html.cxx b/autodoc/source/parser_i/idoc/tk_html.cxx index d26720bd9b0d..a1b719a4826c 100644 --- a/autodoc/source/parser_i/idoc/tk_html.cxx +++ b/autodoc/source/parser_i/idoc/tk_html.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 @@ -41,7 +41,7 @@ namespace dsapi { void -Tok_HtmlTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_HtmlTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_HtmlTag(*this); } diff --git a/autodoc/source/parser_i/idoc/tk_xml.cxx b/autodoc/source/parser_i/idoc/tk_xml.cxx index a1f60d0ef98a..6d4e51aa2f42 100644 --- a/autodoc/source/parser_i/idoc/tk_xml.cxx +++ b/autodoc/source/parser_i/idoc/tk_xml.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 @@ -38,35 +38,35 @@ using csi::dsapi::Tok_XmlLink_Tag; using csi::dsapi::Tok_XmlFormat_Tag; -lux::EnumValueMap G_aTok_XmlConst_EV_TokenId_Values; +lux::EnumValueMap G_aTok_XmlConst_EV_TokenId_Values; Tok_XmlConst::EV_TokenId ev_consts_none(Tok_XmlConst::e_none,""); Tok_XmlConst::EV_TokenId ev_e_true(Tok_XmlConst::e_true,"true"); Tok_XmlConst::EV_TokenId ev_e_false(Tok_XmlConst::e_false,"false"); Tok_XmlConst::EV_TokenId ev_e_null(Tok_XmlConst::e_null,"NULL"); Tok_XmlConst::EV_TokenId ev_e_void(Tok_XmlConst::e_void,"void"); -lux::EnumValueMap G_aTok_XmlLink_Tag_EV_TokenId_Values; +lux::EnumValueMap G_aTok_XmlLink_Tag_EV_TokenId_Values; Tok_XmlLink_Tag::EV_TokenId ev_linktags_none(Tok_XmlLink_Tag::e_none,""); Tok_XmlLink_Tag::EV_TokenId ev_e_const(Tok_XmlLink_Tag::e_const,"const"); Tok_XmlLink_Tag::EV_TokenId ev_member(Tok_XmlLink_Tag::member,"member"); Tok_XmlLink_Tag::EV_TokenId ev_type(Tok_XmlLink_Tag::type,"type"); -lux::EnumValueMap G_aTok_XmlFormat_Tag_EV_TokenId_Values; +lux::EnumValueMap G_aTok_XmlFormat_Tag_EV_TokenId_Values; Tok_XmlFormat_Tag::EV_TokenId ev_formattags_none(Tok_XmlFormat_Tag::e_none,""); Tok_XmlFormat_Tag::EV_TokenId ev_code(Tok_XmlFormat_Tag::code,"code"); Tok_XmlFormat_Tag::EV_TokenId ev_listing(Tok_XmlFormat_Tag::listing,"listing"); Tok_XmlFormat_Tag::EV_TokenId ev_atom(Tok_XmlFormat_Tag::atom,"code"); - + namespace lux { template<> EnumValueMap & -Tok_XmlConst::EV_TokenId::Values_() { return G_aTok_XmlConst_EV_TokenId_Values; } +Tok_XmlConst::EV_TokenId::Values_() { return G_aTok_XmlConst_EV_TokenId_Values; } template<> EnumValueMap & -Tok_XmlLink_Tag::EV_TokenId::Values_() { return G_aTok_XmlLink_Tag_EV_TokenId_Values; } +Tok_XmlLink_Tag::EV_TokenId::Values_() { return G_aTok_XmlLink_Tag_EV_TokenId_Values; } template<> EnumValueMap & -Tok_XmlFormat_Tag::EV_TokenId::Values_() { return G_aTok_XmlFormat_Tag_EV_TokenId_Values; } +Tok_XmlFormat_Tag::EV_TokenId::Values_() { return G_aTok_XmlFormat_Tag_EV_TokenId_Values; } } // namespace lux @@ -78,7 +78,7 @@ namespace dsapi { void -Tok_XmlConst::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlConst::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlConst(*this); } @@ -90,7 +90,7 @@ Tok_XmlConst::Text() const } void -Tok_XmlLink_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlLink_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlLink_BeginTag(*this); } @@ -118,7 +118,7 @@ Tok_XmlLink_BeginTag::Text() const } void -Tok_XmlLink_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlLink_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlLink_EndTag(*this); } @@ -135,7 +135,7 @@ Tok_XmlLink_EndTag::Text() const } void -Tok_XmlFormat_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlFormat_BeginTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlFormat_BeginTag(*this); } @@ -152,7 +152,7 @@ Tok_XmlFormat_BeginTag::Text() const } void -Tok_XmlFormat_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const +Tok_XmlFormat_EndTag::Trigger( TokenInterpreter & io_rInterpreter ) const { io_rInterpreter.Process_XmlFormat_EndTag(*this); } diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx index b8a08fa987b4..44269613e3b9 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_docu2.hxx @@ -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 @@ -51,30 +51,30 @@ class Token_Receiver; class Cx_Base : public ::TkpContext { public: - virtual bool PassNewToken(); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); protected: // LIFECYCLE Cx_Base( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : rReceiver(o_rReceiver), + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : rReceiver(o_rReceiver), pFollowUpContext(&i_rFollowUpContext) // pNewToken { } protected: - void SetToken( - DYN Token * let_dpToken ) + void SetToken( + DYN Token * let_dpToken ) { pNewToken = let_dpToken; } void Handle_DocuSyntaxError( CharacterSource & io_rText ); private: // DATA - Token_Receiver & rReceiver; - TkpContext * pFollowUpContext; - Dyn<Token> pNewToken; + Token_Receiver & rReceiver; + TkpContext * pFollowUpContext; + Dyn<Token> pNewToken; }; @@ -83,18 +83,18 @@ class Cx_EoHtml : public Cx_Base public: // LIFECYCLE Cx_EoHtml( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetIfIsStartOfParagraph( - bool i_bNextTokenProperty ) + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetIfIsStartOfParagraph( + bool i_bNextTokenProperty ) { bToken_IsStartOfParagraph = i_bNextTokenProperty; } private: - bool bToken_IsStartOfParagraph; + bool bToken_IsStartOfParagraph; }; class Cx_EoXmlConst : public Cx_Base @@ -102,18 +102,18 @@ class Cx_EoXmlConst : public Cx_Base public: // LIFECYCLE Cx_EoXmlConst( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( lux::Enum< Tok_XmlConst::E_TokenId > i_eTokenId ) { eTokenId = i_eTokenId; } private: - Tok_XmlConst::EV_TokenId + Tok_XmlConst::EV_TokenId eTokenId; }; @@ -122,13 +122,13 @@ class Cx_EoXmlLink_BeginTag : public Cx_Base public: // LIFECYCLE Cx_EoXmlLink_BeginTag( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( Tok_XmlLink_BeginTag::EV_TokenId i_eTokenId ) { eTokenId = i_eTokenId; } @@ -142,13 +142,13 @@ class Cx_EoXmlLink_EndTag : public Cx_Base public: // LIFECYCLE Cx_EoXmlLink_EndTag( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( Tok_XmlLink_EndTag::EV_TokenId i_eTokenId ) { eTokenId = i_eTokenId; } @@ -162,13 +162,13 @@ class Cx_EoXmlFormat_BeginTag : public Cx_Base public: // LIFECYCLE Cx_EoXmlFormat_BeginTag( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( lux::Enum< Tok_XmlFormat_BeginTag::E_TokenId > i_eTokenId ) { eTokenId = i_eTokenId; } @@ -182,13 +182,13 @@ class Cx_EoXmlFormat_EndTag : public Cx_Base public: // LIFECYCLE Cx_EoXmlFormat_EndTag( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetTokenId( + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetTokenId( lux::Enum< Tok_XmlFormat_EndTag::E_TokenId > i_eTokenId ) { eTokenId = i_eTokenId; } @@ -202,26 +202,26 @@ class Cx_CheckStar : public Cx_Base public: // LIFECYCLE Cx_CheckStar( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext), + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext), bIsEnd(false), bEndTokenFound(false) { } - void Set_End_FolloUpContext( - TkpContext & i_rEnd_FollowUpContext ) + void Set_End_FolloUpContext( + TkpContext & i_rEnd_FollowUpContext ) { pEnd_FollowUpContext = &i_rEnd_FollowUpContext; } - virtual void ReadCharChain( - CharacterSource & io_rText ); - void SetIsEnd( - bool i_bIsEnd ) + virtual void ReadCharChain( + CharacterSource & io_rText ); + void SetIsEnd( + bool i_bIsEnd ) { bIsEnd = i_bIsEnd; } virtual TkpContext & FollowUpContext(); private: - TkpContext * pEnd_FollowUpContext; - bool bIsEnd; - bool bEndTokenFound; + TkpContext * pEnd_FollowUpContext; + bool bIsEnd; + bool bEndTokenFound; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx index 6e229c0af51b..7cf99190c190 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/cx_dsapi.hxx @@ -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 @@ -61,44 +61,44 @@ class Context_Docu : public TkpDocuContext, private StateMachineContext { public: - // LIFECYCLE + // LIFECYCLE Context_Docu( - Token_Receiver & o_rReceiver ); - virtual void SetParentContext( - TkpContext & io_rParentContext, - const char * i_sMultiLineEndToken ); + Token_Receiver & o_rReceiver ); + virtual void SetParentContext( + TkpContext & io_rParentContext, + const char * i_sMultiLineEndToken ); ~Context_Docu(); - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); - virtual bool PassNewToken(); - virtual void SetMode_IsMultiLine( - bool i_bTrue ); + virtual bool PassNewToken(); + virtual void SetMode_IsMultiLine( + bool i_bTrue ); - // INQUIRY + // INQUIRY virtual TkpContext & FollowUpContext(); private: - // SERVICE FUNCTIONS - virtual void PerformStatusFunction( - uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ); + // SERVICE FUNCTIONS + virtual void PerformStatusFunction( + uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ); - void SetupStateMachine(); + void SetupStateMachine(); - // DATA - StateMachin2 aStateMachine; - Token_Receiver * pReceiver; + // DATA + StateMachin2 aStateMachine; + Token_Receiver * pReceiver; // Contexts - TkpContext * pParentContext; - String sMultiLineEndToken; + TkpContext * pParentContext; + String sMultiLineEndToken; - Dyn<Cx_EoHtml> pCx_EoHtml; - Dyn<Cx_EoXmlConst> pCx_EoXmlConst; + Dyn<Cx_EoHtml> pCx_EoHtml; + Dyn<Cx_EoXmlConst> pCx_EoXmlConst; Dyn<Cx_EoXmlLink_BeginTag> pCx_EoXmlLink_BeginTag; Dyn<Cx_EoXmlLink_EndTag> @@ -107,11 +107,11 @@ class Context_Docu : public TkpDocuContext, pCx_EoXmlFormat_BeginTag; Dyn<Cx_EoXmlFormat_EndTag> pCx_EoXmlFormat_EndTag; - Dyn<Cx_CheckStar> pCx_CheckStar; + Dyn<Cx_CheckStar> pCx_CheckStar; // Temporary data, used during ReadCharChain() - Dyn<Token> pNewToken; - ::TkpContext * pFollowUpContext; + Dyn<Token> pNewToken; + ::TkpContext * pFollowUpContext; bool bIsMultiline; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx index 977f9b65bf9e..a3a6b5306536 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/docu_pe2.hxx @@ -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 @@ -70,41 +70,41 @@ class SapiDocu_PE : public TokenInterpreter ParserInfo & io_rPositionInfo ); ~SapiDocu_PE(); - void ProcessToken( + void ProcessToken( DYN csi::dsapi::Token & let_drToken ); - virtual void Process_AtTag( - const Tok_AtTag & i_rToken ); - virtual void Process_HtmlTag( - const Tok_HtmlTag & i_rToken ); - virtual void Process_XmlConst( + virtual void Process_AtTag( + const Tok_AtTag & i_rToken ); + virtual void Process_HtmlTag( + const Tok_HtmlTag & i_rToken ); + virtual void Process_XmlConst( const Tok_XmlConst & i_rToken ); - virtual void Process_XmlLink_BeginTag( + virtual void Process_XmlLink_BeginTag( const Tok_XmlLink_BeginTag & i_rToken ); - virtual void Process_XmlLink_EndTag( + virtual void Process_XmlLink_EndTag( const Tok_XmlLink_EndTag & i_rToken ); - virtual void Process_XmlFormat_BeginTag( + virtual void Process_XmlFormat_BeginTag( const Tok_XmlFormat_BeginTag & i_rToken ); - virtual void Process_XmlFormat_EndTag( + virtual void Process_XmlFormat_EndTag( const Tok_XmlFormat_EndTag & i_rToken ); - virtual void Process_Word( - const Tok_Word & i_rToken ); - virtual void Process_Comma(); - virtual void Process_DocuEnd(); - virtual void Process_EOL(); - virtual void Process_White(); + virtual void Process_Word( + const Tok_Word & i_rToken ); + virtual void Process_Comma(); + virtual void Process_DocuEnd(); + virtual void Process_EOL(); + virtual void Process_White(); DYN ary::doc::OldIdlDocu * ReleaseJustParsedDocu(); - bool IsComplete() const; + bool IsComplete() const; private: enum E_State @@ -118,48 +118,48 @@ class SapiDocu_PE : public TokenInterpreter typedef void ( SapiDocu_PE::*F_TokenAdder )( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2Void( + void AddDocuToken2Void( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2Short( + void AddDocuToken2Short( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2Description( + void AddDocuToken2Description( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2Deprecated( + void AddDocuToken2Deprecated( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2CurAtTag( + void AddDocuToken2CurAtTag( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurParameterAtTagName( + void SetCurParameterAtTagName( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurSeeAlsoAtTagLinkText( + void SetCurSeeAlsoAtTagLinkText( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurSeeAlsoAtTagLinkText_2( + void SetCurSeeAlsoAtTagLinkText_2( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurSeeAlsoAtTagLinkText_3( + void SetCurSeeAlsoAtTagLinkText_3( DYN ary::inf::DocuToken & let_drNewToken ); - void SetCurSinceAtTagVersion( + void SetCurSinceAtTagVersion( DYN ary::inf::DocuToken & let_drNewToken ); - void AddDocuToken2SinceAtTag( + void AddDocuToken2SinceAtTag( DYN ary::inf::DocuToken & let_drNewToken ); // DATA Dyn<ary::doc::OldIdlDocu> pDocu; - E_State eState; + E_State eState; ParserInfo * pPositionInfo; - F_TokenAdder fCurTokenAddFunction; + F_TokenAdder fCurTokenAddFunction; - Dyn<DT_AtTag> pCurAtTag; + Dyn<DT_AtTag> pCurAtTag; String sCurDimAttribute; StreamStr sCurAtSeeType_byXML; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx index 9ccccee02ef8..8d8d418b1104 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/dsapitok.hxx @@ -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 @@ -49,11 +49,11 @@ class Token : public TextToken { public: // LIFECYCLE - virtual ~Token() {} + virtual ~Token() {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const = 0; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx index 57bf561ffdce..dd2e097678ce 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_atag2.hxx @@ -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 @@ -68,17 +68,17 @@ class Tok_AtTag : public Token // Spring and Fall Tok_AtTag( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } private: - EV_TokenId eTag; + EV_TokenId eTag; }; } // namespace dsapi diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx index 5ee763969ad6..25ebd547f47c 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_docw2.hxx @@ -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 @@ -46,27 +46,27 @@ class Tok_Word : public Token public: // Spring and Fall Tok_Word( - const char * i_sText ) - : sText(i_sText) {} + const char * i_sText ) + : sText(i_sText) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; private: // DATA - String sText; + String sText; }; class Tok_Comma : public Token { public: // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; class Tok_DocuEnd : public Token @@ -74,10 +74,10 @@ class Tok_DocuEnd : public Token public: // Spring and Fall // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; class Tok_EOL : public Token @@ -85,10 +85,10 @@ class Tok_EOL : public Token public: // Spring and Fall // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; class Tok_EOF : public Token @@ -96,20 +96,20 @@ class Tok_EOF : public Token public: // Spring and Fall // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; class Tok_White : public Token { public: // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; + virtual const char* Text() const; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx index 3d69c13d296c..7bb8a26aa195 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_html.hxx @@ -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 @@ -47,22 +47,22 @@ class Tok_HtmlTag : public Token public: // Spring and Fall Tok_HtmlTag( - const char * i_sTag, - bool i_bIsParagraphStarter ) - : sTag(i_sTag), + const char * i_sTag, + bool i_bIsParagraphStarter ) + : sTag(i_sTag), bIsParagraphStarter(i_bIsParagraphStarter) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - bool IsParagraphStarter() const + virtual const char* Text() const; + bool IsParagraphStarter() const { return bIsParagraphStarter; } private: - String sTag; - bool bIsParagraphStarter; + String sTag; + bool bIsParagraphStarter; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx index 7bb8db52a27f..50d85212aaac 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tk_xml.hxx @@ -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 @@ -64,18 +64,18 @@ class Tok_XmlConst : public Tok_XmlTag // Spring and Fall Tok_XmlConst( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class Tok_XmlLink_Tag : public Tok_XmlTag @@ -97,26 +97,26 @@ class Tok_XmlLink_BeginTag : public Tok_XmlLink_Tag public: // Spring and Fall Tok_XmlLink_BeginTag( - EV_TokenId i_eTag, - const String & i_sScope, - const String & i_sDim ) - : eTag(i_eTag), + EV_TokenId i_eTag, + const String & i_sScope, + const String & i_sDim ) + : eTag(i_eTag), sScope(i_sScope), sDim(i_sDim) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } - const String & Scope() const { return sScope; } - const String & Dim() const { return sDim; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } + const String & Scope() const { return sScope; } + const String & Dim() const { return sDim; } private: // DATA - EV_TokenId eTag; - String sScope; - String sDim; + EV_TokenId eTag; + String sScope; + String sDim; }; class Tok_XmlLink_EndTag : public Tok_XmlLink_Tag @@ -124,18 +124,18 @@ class Tok_XmlLink_EndTag : public Tok_XmlLink_Tag public: // Spring and Fall Tok_XmlLink_EndTag( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class Tok_XmlFormat_Tag : public Tok_XmlTag @@ -157,21 +157,21 @@ class Tok_XmlFormat_BeginTag : public Tok_XmlFormat_Tag public: // Spring and Fall Tok_XmlFormat_BeginTag( - EV_TokenId i_eTag, + EV_TokenId i_eTag, const String & i_sDim ) - : eTag(i_eTag), + : eTag(i_eTag), sDim(i_sDim) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } - const String & Dim() const { return sDim; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } + const String & Dim() const { return sDim; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; String sDim; }; @@ -180,18 +180,18 @@ class Tok_XmlFormat_EndTag : public Tok_XmlFormat_Tag public: // Spring and Fall Tok_XmlFormat_EndTag( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY - virtual const char* Text() const; - E_TokenId Id() const { return eTag; } + virtual const char* Text() const; + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx index fed4c0e25121..8437f4f23843 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tokintpr.hxx @@ -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 @@ -54,33 +54,33 @@ class Tok_HtmlTag; class TokenInterpreter { public: - virtual ~TokenInterpreter() {} + virtual ~TokenInterpreter() {} - virtual void Process_AtTag( - const Tok_AtTag & i_rToken ) = 0; - virtual void Process_HtmlTag( - const Tok_HtmlTag & i_rToken ) = 0; - virtual void Process_XmlConst( + virtual void Process_AtTag( + const Tok_AtTag & i_rToken ) = 0; + virtual void Process_HtmlTag( + const Tok_HtmlTag & i_rToken ) = 0; + virtual void Process_XmlConst( const Tok_XmlConst & i_rToken ) = 0; - virtual void Process_XmlLink_BeginTag( + virtual void Process_XmlLink_BeginTag( const Tok_XmlLink_BeginTag & i_rToken ) = 0; - virtual void Process_XmlLink_EndTag( + virtual void Process_XmlLink_EndTag( const Tok_XmlLink_EndTag & i_rToken ) = 0; - virtual void Process_XmlFormat_BeginTag( + virtual void Process_XmlFormat_BeginTag( const Tok_XmlFormat_BeginTag & i_rToken ) = 0; - virtual void Process_XmlFormat_EndTag( + virtual void Process_XmlFormat_EndTag( const Tok_XmlFormat_EndTag & i_rToken ) = 0; - virtual void Process_Word( - const Tok_Word & i_rToken ) = 0; - virtual void Process_Comma() = 0; - virtual void Process_DocuEnd() = 0; - virtual void Process_EOL() = 0; - virtual void Process_White() = 0; + virtual void Process_Word( + const Tok_Word & i_rToken ) = 0; + virtual void Process_Comma() = 0; + virtual void Process_DocuEnd() = 0; + virtual void Process_EOL() = 0; + virtual void Process_White() = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx index 14ef872d4306..be7d77262073 100644 --- a/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx +++ b/autodoc/source/parser_i/inc/s2_dsapi/tokrecv.hxx @@ -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 @@ -47,9 +47,9 @@ class Token; class Token_Receiver { public: - virtual ~Token_Receiver() {} - virtual void Receive( - DYN Token & let_drToken ) = 0; + virtual ~Token_Receiver() {} + virtual void Receive( + DYN Token & let_drToken ) = 0; virtual void Increment_CurLine() = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx index 07d325846238..db10741e5dd8 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/cx_idlco.hxx @@ -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 @@ -51,36 +51,36 @@ class Context_UidlCode : public TkpContext, private StateMachineContext { public: - // LIFECYCLE + // LIFECYCLE Context_UidlCode( - Token_Receiver & o_rReceiver, + Token_Receiver & o_rReceiver, DYN TkpDocuContext & - let_drContext_Docu ); + let_drContext_Docu ); ~Context_UidlCode(); - // OPERATORS + // OPERATORS - // OPERATIONS - virtual void ReadCharChain( - CharacterSource & io_rText ); - virtual bool PassNewToken(); + // OPERATIONS + virtual void ReadCharChain( + CharacterSource & io_rText ); + virtual bool PassNewToken(); - // INQUIRY + // INQUIRY virtual TkpContext & FollowUpContext(); private: - // SERVICE FUNCTIONS - void PerformStatusFunction( - uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ); - void SetupStateMachine(); + // SERVICE FUNCTIONS + void PerformStatusFunction( + uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ); + void SetupStateMachine(); - // DATA - StateMachin2 aStateMachine; - Token_Receiver * pReceiver; + // DATA + StateMachin2 aStateMachine; + Token_Receiver * pReceiver; // Contexts - Dyn<TkpDocuContext> pDocuContext; + Dyn<TkpDocuContext> pDocuContext; Dyn<TkpContext> dpContext_MLComment; Dyn<TkpContext> dpContext_SLComment; @@ -88,8 +88,8 @@ class Context_UidlCode : public TkpContext, Dyn<TkpContext> dpContext_Assignment; // Temporary data, used during ReadCharChain() - Dyn<Token> pNewToken; - ::TkpContext * pFollowUpContext; + Dyn<Token> pNewToken; + ::TkpContext * pFollowUpContext; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx b/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx index 0113a87c11e7..b1e96671b782 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/cx_sub.hxx @@ -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 @@ -49,29 +49,29 @@ class Token; class Cx_Base : public ::TkpContext { public: - virtual bool PassNewToken(); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); protected: // LIFECYCLE Cx_Base( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : rReceiver(o_rReceiver), + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : rReceiver(o_rReceiver), pFollowUpContext(&i_rFollowUpContext), pNewToken() {} protected: - void SetToken( - DYN Token * let_dpToken ) + void SetToken( + DYN Token * let_dpToken ) { pNewToken = let_dpToken; } - Token_Receiver & Receiver() { return rReceiver; } + Token_Receiver & Receiver() { return rReceiver; } private: // DATA - Token_Receiver & rReceiver; - TkpContext * pFollowUpContext; - Dyn<Token> pNewToken; + Token_Receiver & rReceiver; + TkpContext * pFollowUpContext; + Dyn<Token> pNewToken; }; @@ -84,44 +84,44 @@ class Context_MLComment : public Cx_Base { public: Context_MLComment( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_SLComment : public Cx_Base { public: Context_SLComment( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_Praeprocessor : public Cx_Base { public: Context_Praeprocessor( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; class Context_Assignment : public Cx_Base { public: Context_Assignment( - Token_Receiver & o_rReceiver, - TkpContext & i_rFollowUpContext ) - : Cx_Base(o_rReceiver, i_rFollowUpContext) {} - virtual void ReadCharChain( - CharacterSource & io_rText ); + Token_Receiver & o_rReceiver, + TkpContext & i_rFollowUpContext ) + : Cx_Base(o_rReceiver, i_rFollowUpContext) {} + virtual void ReadCharChain( + CharacterSource & io_rText ); }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx index 411fc402eb42..eec22017ff40 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/distrib.hxx @@ -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 @@ -68,8 +68,8 @@ namespace uidl { -typedef std::vector< DYN Token * > TokenQueue; -typedef TokenQueue::iterator TokenIterator; +typedef std::vector< DYN Token * > TokenQueue; +typedef TokenQueue::iterator TokenIterator; class TokenParser_Uidl; class UnoIDL_PE; @@ -81,21 +81,21 @@ class TokenDistributor : private TokenProcessing_Types { public: TokenDistributor( - ary::Repository & io_rRepository, + ary::Repository & io_rRepository, ParserInfo & io_rParserInfo ); - void SetTokenProvider( - TokenParser_Uidl & io_rTokenSource ); - void SetTopParseEnvironment( - UnoIDL_PE & io_pTopParseEnvironment ); + void SetTokenProvider( + TokenParser_Uidl & io_rTokenSource ); + void SetTopParseEnvironment( + UnoIDL_PE & io_pTopParseEnvironment ); ~TokenDistributor(); - void Reset() { aDocumentation.Reset(); } - /** calls pTokenSource->GetNextToken() and checks the incoming tokens, until a + void Reset() { aDocumentation.Reset(); } + /** calls pTokenSource->GetNextToken() and checks the incoming tokens, until a usable token is found. This token will be forwarded to pTopParseEnv; */ - void TradeToken(); + void TradeToken(); csi::uidl::Token_Receiver & CodeTokens_Receiver(); @@ -122,59 +122,59 @@ class TokenDistributor : private TokenProcessing_Types class ProcessingData; friend class ProcessingData; - class ProcessingData : public csi::uidl::Token_Receiver, + class ProcessingData : public csi::uidl::Token_Receiver, private TokenProcessing_Types { public: ProcessingData( - ary::Repository & io_rRepository, - Documentation & i_rDocuProcessor, + ary::Repository & io_rRepository, + Documentation & i_rDocuProcessor, ParserInfo & io_rParserInfo ); ~ProcessingData(); - void SetTopParseEnvironment( - UnoIDL_PE & io_pTopParseEnvironment ); + void SetTopParseEnvironment( + UnoIDL_PE & io_pTopParseEnvironment ); - /** is called from pTokenSource before finishing a ::TokenParse2::GetNextToken() + /** is called from pTokenSource before finishing a ::TokenParse2::GetNextToken() call and passes the just parsed token to this class. */ - virtual void Receive( + virtual void Receive( DYN csi::uidl::Token & let_drToken ); virtual void Increment_CurLine(); - void ProcessCurToken(); + void ProcessCurToken(); - UnoIDL_PE & CurEnvironment() const; - bool NextTokenExists() const; + UnoIDL_PE & CurEnvironment() const; + bool NextTokenExists() const; void Set_PublishedOn() { bPublishedRecentlyOn = true; } private: - typedef uintt TokenQ_Position; - typedef std::pair< UnoIDL_PE *, TokenQ_Position > EnvironmentInfo; + typedef uintt TokenQ_Position; + typedef std::pair< UnoIDL_PE *, TokenQ_Position > EnvironmentInfo; typedef std::vector< EnvironmentInfo > EnvironmentStack; - void AcknowledgeResult(); + void AcknowledgeResult(); const csi::uidl::Token & CurToken() const; - UnoIDL_PE & CurEnv() const; - UnoIDL_PE & PushEnv() const; - uintt CurTokenPosition() const; + UnoIDL_PE & CurEnv() const; + UnoIDL_PE & PushEnv() const; + uintt CurTokenPosition() const; uintt CurEnv_TriedTokenPosition() const; - void DecrementTryCount(); + void DecrementTryCount(); - EnvironmentStack aEnvironments; - TokenQueue aTokenQueue; - TokenIterator itCurToken; + EnvironmentStack aEnvironments; + TokenQueue aTokenQueue; + TokenIterator itCurToken; TokenProcessing_Result aCurResult; - uintt nTryCount; - bool bFinished; + uintt nTryCount; + bool bFinished; ary::Repository & rRepository; ParserInfo & rParserInfo; - Documentation * pDocuProcessor; + Documentation * pDocuProcessor; bool bPublishedRecentlyOn; }; @@ -185,9 +185,9 @@ class TokenDistributor : private TokenProcessing_Types ParserInfo & io_rParserInfo); ~Documentation(); - void Reset() { bIsPassedFirstDocu = false; } + void Reset() { bIsPassedFirstDocu = false; } - virtual void Receive( + virtual void Receive( DYN csi::dsapi::Token & let_drToken ); virtual void Increment_CurLine(); @@ -200,13 +200,13 @@ class TokenDistributor : private TokenProcessing_Types ParserInfo & rParserInfo; Dyn<ary::doc::OldIdlDocu> pMostRecentDocu; - bool bIsPassedFirstDocu; + bool bIsPassedFirstDocu; }; // DATA - TokenParser_Uidl * pTokenSource; - Documentation aDocumentation; - ProcessingData aProcessingData; + TokenParser_Uidl * pTokenSource; + Documentation aDocumentation; + ProcessingData aProcessingData; }; @@ -214,7 +214,7 @@ class TokenDistributor : private TokenProcessing_Types // IMPLEMENTATION inline void -TokenDistributor::SetTokenProvider( TokenParser_Uidl & io_rTokenSource ) +TokenDistributor::SetTokenProvider( TokenParser_Uidl & io_rTokenSource ) { pTokenSource = &io_rTokenSource; } inline void diff --git a/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx index 7708ac66775e..a6278f0dd240 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/parsenv2.hxx @@ -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 @@ -76,60 +76,60 @@ class UnoIDL_PE : virtual protected TokenProcessing_Types public: virtual ~UnoIDL_PE(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); -// virtual void EstablishContacts( -// UnoIDL_PE * io_pParentPE, -// ary::idl::Gate & +// virtual void EstablishContacts( +// UnoIDL_PE * io_pParentPE, +// ary::idl::Gate & // io_rGate, -// TokenProcessing_Result & -// o_rResult ); - virtual void Enter( - E_EnvStackAction i_eWayOfEntering ); - virtual void Leave( - E_EnvStackAction i_eWayOfLeaving ); - virtual void ProcessToken( - const Token & i_rToken ) = 0; - - void SetDocu( +// TokenProcessing_Result & +// o_rResult ); + virtual void Enter( + E_EnvStackAction i_eWayOfEntering ); + virtual void Leave( + E_EnvStackAction i_eWayOfLeaving ); + virtual void ProcessToken( + const Token & i_rToken ) = 0; + + void SetDocu( DYN ary::doc::OldIdlDocu * let_dpDocu ); - void SetPublished(); - void SetOptional(); - void PassDocuAt( + void SetPublished(); + void SetOptional(); + void PassDocuAt( ary::idl::CodeEntity & io_rCe ); - UnoIDL_PE * Parent() const { return aMyNode.Parent(); } + UnoIDL_PE * Parent() const { return aMyNode.Parent(); } - void SetResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push = 0 ) + void SetResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push = 0 ) { aMyNode.SetTokenResult( i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push ); } virtual const ary::idl::Module & CurNamespace() const; virtual const ParserInfo & ParseInfo() const; - ary::idl::Gate & Gate() const { return aMyNode.AryGate(); } + ary::idl::Gate & Gate() const { return aMyNode.AryGate(); } TokenProcessing_Result & TokenResult() const { return aMyNode.TokenResult(); } DYN ary::doc::OldIdlDocu * - ReleaseDocu() { return pDocu.Release(); } + ReleaseDocu() { return pDocu.Release(); } protected: UnoIDL_PE(); ary::Repository & MyRepository() { csv_assert(pRepository != 0); return *pRepository; } private: - virtual void InitData(); - virtual void TransferData() = 0; - virtual void ReceiveData(); + virtual void InitData(); + virtual void TransferData() = 0; + virtual void ReceiveData(); - SemanticNode aMyNode; + SemanticNode aMyNode; Dyn<ary::doc::OldIdlDocu> pDocu; ary::Repository * pRepository; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx index 222fcdf43b7a..5a6dffc76f7b 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_attri.hxx @@ -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 @@ -69,30 +69,30 @@ class PE_Attribute : public UnoIDL_PE, PE_Attribute( const Ce_id & i_rCurOwner ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual ~PE_Attribute(); + virtual ~PE_Attribute(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Raises(); - virtual void Process_Default(); + virtual void Process_Raises(); + virtual void Process_Default(); private: enum E_State @@ -106,23 +106,23 @@ class PE_Attribute : public UnoIDL_PE, in_set }; - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA E_State eState; const Ce_id * pCurOwner; - Dyn<PE_Variable> pPE_Variable; - Dyn<PE_Type> pPE_Exception; + Dyn<PE_Variable> pPE_Variable; + Dyn<PE_Type> pPE_Exception; // object-data ary::idl::Attribute * pCurAttribute; - Type_id nCurParsedType; - String sCurParsedName; + Type_id nCurParsedType; + String sCurParsedName; bool bReadOnly; bool bBound; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx index 397a235e4748..74d9302107d8 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_const.hxx @@ -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 @@ -58,24 +58,24 @@ class PE_Constant : public UnoIDL_PE, { public: PE_Constant(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Constant(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); @@ -100,40 +100,40 @@ class PE_Constant : public UnoIDL_PE, typedef void (PE_Constant::*F_TOK)(const char *); - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); - void On_expect_name_Identifier(const char * i_sText); - void On_expect_curl_bracket_open_Punctuation(const char * i_sText); - void On_expect_const_Stereotype(const char * i_sText); - void On_expect_const_Punctuation(const char * i_sText); - void On_expect_value_Identifier(const char * i_sText); + void On_expect_name_Identifier(const char * i_sText); + void On_expect_curl_bracket_open_Punctuation(const char * i_sText); + void On_expect_const_Stereotype(const char * i_sText); + void On_expect_const_Punctuation(const char * i_sText); + void On_expect_value_Identifier(const char * i_sText); void On_expect_finish_Punctuation(const char * i_sText); - void On_Default(const char * ); + void On_Default(const char * ); - void EmptySingleConstData(); - void CreateSingleConstant(); + void EmptySingleConstData(); + void CreateSingleConstant(); - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; E_State eState; String sData_Name; - ary::idl::Ce_id nDataId; + ary::idl::Ce_id nDataId; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nType; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nType; - Dyn<PE_Value> pPE_Value; - String sName; - String sAssignment; + Dyn<PE_Value> pPE_Value; + String sName; + String sAssignment; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx index 2fef65658d9b..4d97c58ade7b 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_enum2.hxx @@ -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 @@ -54,20 +54,20 @@ class PE_Enum : public UnoIDL_PE, { public: PE_Enum(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Enum(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); @@ -90,36 +90,36 @@ class PE_Enum : public UnoIDL_PE, typedef void (PE_Enum::*F_TOK)(const char *); - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); - void On_expect_name_Identifier(const char * i_sText); - void On_expect_curl_bracket_open_Punctuation(const char * i_sText); - void On_expect_value_Punctuation(const char * i_sText); - void On_expect_value_Identifier(const char * i_sText); + void On_expect_name_Identifier(const char * i_sText); + void On_expect_curl_bracket_open_Punctuation(const char * i_sText); + void On_expect_value_Punctuation(const char * i_sText); + void On_expect_value_Identifier(const char * i_sText); void On_expect_finish_Punctuation(const char * i_sText); - void On_Default(const char * ); + void On_Default(const char * ); - void EmptySingleValueData(); - void CreateSingleValue(); + void EmptySingleValueData(); + void CreateSingleValue(); - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; E_State eState; String sData_Name; - ary::idl::Ce_id nDataId; + ary::idl::Ce_id nDataId; - Dyn<PE_Value> pPE_Value; - String sName; - String sAssignment; + Dyn<PE_Value> pPE_Value; + String sName; + String sAssignment; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx index 13bb996e6380..dbd279578f2a 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_evalu.hxx @@ -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 @@ -54,27 +54,27 @@ class PE_Value : public UnoIDL_PE, { public: PE_Value( - String & o_rName, - String & o_rAssignment, - bool i_bIsConst ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + String & o_rName, + String & o_rAssignment, + bool i_bIsConst ); + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Value(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Assignment( + virtual void Process_Assignment( const TokAssignment & i_rToken ); private: @@ -85,7 +85,7 @@ class PE_Value : public UnoIDL_PE, got_name, e_STATES_MAX }; - enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. + enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. { tt_identifier = 0, tt_punctuation = 1, @@ -95,27 +95,27 @@ class PE_Value : public UnoIDL_PE, typedef void (PE_Value::*F_TOK)(const char *); - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); - void On_expect_name_Identifier(const char * i_sText); - void On_got_name_Punctuation(const char * i_sText); - void On_got_name_Assignment(const char * i_sText); - void On_Default(const char * ); + void On_expect_name_Identifier(const char * i_sText); + void On_got_name_Punctuation(const char * i_sText); + void On_got_name_Assignment(const char * i_sText); + void On_Default(const char * ); - virtual void InitData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); - bool IsConst() const { return bIsConst; } + bool IsConst() const { return bIsConst; } - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; E_State eState; - String * pName; - String * pAssignment; - bool bIsConst; + String * pName; + String * pAssignment; + bool bIsConst; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx index 4d6a9bd96872..6fe3b21105ba 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_excp.hxx @@ -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 @@ -68,35 +68,35 @@ class PE_Exception : public UnoIDL_PE { public: PE_Exception(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Exception(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); private: struct S_Work { S_Work(); - void InitData(); - void Prepare_PE_QualifiedName(); - void Prepare_PE_Element(); - void Data_Set_Name( - const char * i_sName ); + void InitData(); + void Prepare_PE_QualifiedName(); + void Prepare_PE_Element(); + void Data_Set_Name( + const char * i_sName ); // DATA String sData_Name; - bool bIsPreDeclaration; - ary::idl::Ce_id nCurStruct; + bool bIsPreDeclaration; + ary::idl::Ce_id nCurStruct; Dyn<PE_StructElement> pPE_Element; - ary::idl::Ce_id nCurParsed_ElementRef; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Base; + ary::idl::Ce_id nCurParsed_ElementRef; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Base; }; struct S_Stati; @@ -111,50 +111,50 @@ class PE_Exception : public UnoIDL_PE protected: PE_StructState( - PE_Exception & i_rStruct ) - : rStruct(i_rStruct) {} - void MoveState( - ParseEnvState & i_rState ) const; - void SetResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push = 0 ) const + PE_Exception & i_rStruct ) + : rStruct(i_rStruct) {} + void MoveState( + ParseEnvState & i_rState ) const; + void SetResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push = 0 ) const { rStruct.SetResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); } - S_Stati & Stati() const { return *rStruct.pStati; } - S_Work & Work() const { return rStruct.aWork; } - PE_Exception & PE() const { return rStruct; } + S_Stati & Stati() const { return *rStruct.pStati; } + S_Work & Work() const { return rStruct.aWork; } + PE_Exception & PE() const { return rStruct; } private: - virtual UnoIDL_PE & MyPE(); + virtual UnoIDL_PE & MyPE(); // DATA - PE_Exception & rStruct; + PE_Exception & rStruct; }; class State_None : public PE_StructState { public: State_None( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} }; class State_WaitForName : public PE_StructState - { // -> Name + { // -> Name public: State_WaitForName( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); }; class State_GotName : public PE_StructState - { // -> : { ; + { // -> : { ; public: State_GotName( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -162,17 +162,17 @@ class PE_Exception : public UnoIDL_PE { // -> Base public: State_WaitForBase( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void On_SubPE_Left(); + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void On_SubPE_Left(); }; class State_GotBase : public PE_StructState { // -> { public: State_GotBase( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -180,30 +180,30 @@ class PE_Exception : public UnoIDL_PE { // -> Typ } public: State_WaitForElement( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_BuiltInType( + virtual void Process_NameSeparator(); + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); -// virtual void On_SubPE_Left(); +// virtual void On_SubPE_Left(); }; class State_WaitForFinish : public PE_StructState { // -> ; public: State_WaitForFinish( - PE_Exception & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Exception & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -211,13 +211,13 @@ class PE_Exception : public UnoIDL_PE struct S_Stati { S_Stati( - PE_Exception & io_rStruct ); - void SetState( - ParseEnvState & i_rNextState ) + PE_Exception & io_rStruct ); + void SetState( + ParseEnvState & i_rNextState ) { pCurStatus = &i_rNextState; } - State_None aNone; - State_WaitForName aWaitForName; + State_None aNone; + State_WaitForName aWaitForName; State_GotName aGotName; State_WaitForBase aWaitForBase; State_GotBase aGotBase; @@ -225,31 +225,31 @@ class PE_Exception : public UnoIDL_PE aWaitForElement; State_WaitForFinish aWaitForFinish; - ParseEnvState * pCurStatus; + ParseEnvState * pCurStatus; }; - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); public: void store_Exception(); - + private: - S_Stati & Stati() { return *pStati; } - S_Work & Work() { return aWork; } + S_Stati & Stati() { return *pStati; } + S_Work & Work() { return aWork; } // DATA - S_Work aWork; - Dyn<S_Stati> pStati; + S_Work aWork; + Dyn<S_Stati> pStati; }; inline void PE_Exception::PE_StructState::MoveState( - ParseEnvState & i_rState ) const + ParseEnvState & i_rState ) const { rStruct.Stati().SetState(i_rState); } } // namespace uidl diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx index e499565e466a..80baf27bd806 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_file2.hxx @@ -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 @@ -69,30 +69,30 @@ class PE_File : public UnoIDL_PE, { public: PE_File( - TokenDistributor & i_rTokenAdmin, + TokenDistributor & i_rTokenAdmin, const ParserInfo & i_parseInfo ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_File(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State @@ -106,31 +106,31 @@ class PE_File : public UnoIDL_PE, on_default }; - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); + virtual UnoIDL_PE & MyPE(); virtual const ary::idl::Module & CurNamespace() const; virtual const ParserInfo & ParseInfo() const; // DATA - TokenDistributor * pTokenAdmin; - Dyn<PE_Service> pPE_Service; - Dyn<PE_Singleton> pPE_Singleton; - Dyn<PE_Interface> pPE_Interface; - Dyn<PE_Struct> pPE_Struct; - Dyn<PE_Exception> pPE_Exception; - Dyn<PE_Constant> pPE_Constant; - Dyn<PE_Enum> pPE_Enum; - Dyn<PE_Typedef> pPE_Typedef; + TokenDistributor * pTokenAdmin; + Dyn<PE_Service> pPE_Service; + Dyn<PE_Singleton> pPE_Singleton; + Dyn<PE_Interface> pPE_Interface; + Dyn<PE_Struct> pPE_Struct; + Dyn<PE_Exception> pPE_Exception; + Dyn<PE_Constant> pPE_Constant; + Dyn<PE_Enum> pPE_Enum; + Dyn<PE_Typedef> pPE_Typedef; const ary::idl::Module * pCurNamespace; const ParserInfo * pParseInfo; - E_State eState; - uintt nBracketCount_inDefMode; + E_State eState; + uintt nBracketCount_inDefMode; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx index 3d639c2f8b6a..ab0caef1277e 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_func2.hxx @@ -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 @@ -62,47 +62,47 @@ class PE_Function : public UnoIDL_PE, public ParseEnvState { public: - typedef ary::idl::Ce_id RParent; - typedef ary::idl::Ce_id RFunction; + typedef ary::idl::Ce_id RParent; + typedef ary::idl::Ce_id RFunction; enum E_Constructor { constructor }; /// Constructor for interfaces. PE_Function( - const RParent & i_rCurInterface ); + const RParent & i_rCurInterface ); /// Constructor for single interface based services. PE_Function( - const RParent & i_rCurService, + const RParent & i_rCurService, E_Constructor i_eCtorMarker ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual ~PE_Function(); + virtual ~PE_Function(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_ParameterHandling( + virtual void Process_ParameterHandling( const TokParameterHandling & i_rToken ); - virtual void Process_Raises(); - virtual void Process_Default(); + virtual void Process_Raises(); + virtual void Process_Default(); private: enum E_State @@ -124,15 +124,15 @@ class PE_Function : public UnoIDL_PE, exceptions_finished }; - void GoIntoReturnType(); - void GoIntoParameterVariable(); - void GoIntoException(); - void OnDefault(); + void GoIntoReturnType(); + void GoIntoParameterVariable(); + void GoIntoException(); + void OnDefault(); - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA E_State eState; @@ -143,18 +143,18 @@ class PE_Function : public UnoIDL_PE, ary::idl::Function * pCurFunction; - const RParent * pCurParent; + const RParent * pCurParent; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsedType; // ReturnType or Exception + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsedType; // ReturnType or Exception - String sName; + String sName; - Dyn<PE_Variable> pPE_Variable; + Dyn<PE_Variable> pPE_Variable; ary::idl::E_ParameterDirection eCurParsedParam_Direction; ary::idl::Type_id nCurParsedParam_Type; - String sCurParsedParam_Name; + String sCurParsedParam_Name; bool bIsForConstructors; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx index 37f33cf8a73a..cf0b40a25dd6 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_iface.hxx @@ -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 @@ -62,35 +62,35 @@ class PE_Interface : public UnoIDL_PE, { public: PE_Interface(); - virtual ~PE_Interface(); + virtual ~PE_Interface(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Identifier( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_BuiltInType( + virtual void Process_NameSeparator(); + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State /// @ATTENTION Do not change existing values (except of e_STATES_MAX) !!! Else array-indices will break. @@ -112,7 +112,7 @@ class PE_Interface : public UnoIDL_PE, in_base_interface, // in body, after "interface" e_STATES_MAX }; - enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. + enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. { tt_metatype = 0, tt_identifier = 1, @@ -124,51 +124,51 @@ class PE_Interface : public UnoIDL_PE, typedef void (PE_Interface::*F_TOK)(const char *); - void On_need_uik_MetaType(const char * i_sText); - void On_uik_Identifier(const char * i_sText); - void On_uik_Punctuation(const char * i_sText); - void On_need_ident_MetaType(const char * i_sText); - void On_ident_Identifier(const char * i_sText); - void On_ident_Punctuation(const char * i_sText); - void On_need_interface_MetaType(const char * i_sText); - void On_need_name_Identifer(const char * i_sText); - void On_wait_for_base_Punctuation(const char * i_sText); - void On_need_curlbr_open_Punctuation(const char * i_sText); - void On_std_Metatype(const char * i_sText); - void On_std_Punctuation(const char * i_sText); - void On_std_Stereotype(const char * i_sText); - void On_std_GotoFunction(const char * i_sText); - void On_std_GotoAttribute(const char * i_sText); - void On_std_GotoBaseInterface(const char * i_sText); - void On_need_finish_Punctuation(const char * i_sText); - void On_Default(const char * i_sText); - - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); - - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); - virtual UnoIDL_PE & MyPE(); + void On_need_uik_MetaType(const char * i_sText); + void On_uik_Identifier(const char * i_sText); + void On_uik_Punctuation(const char * i_sText); + void On_need_ident_MetaType(const char * i_sText); + void On_ident_Identifier(const char * i_sText); + void On_ident_Punctuation(const char * i_sText); + void On_need_interface_MetaType(const char * i_sText); + void On_need_name_Identifer(const char * i_sText); + void On_wait_for_base_Punctuation(const char * i_sText); + void On_need_curlbr_open_Punctuation(const char * i_sText); + void On_std_Metatype(const char * i_sText); + void On_std_Punctuation(const char * i_sText); + void On_std_Stereotype(const char * i_sText); + void On_std_GotoFunction(const char * i_sText); + void On_std_GotoAttribute(const char * i_sText); + void On_std_GotoBaseInterface(const char * i_sText); + void On_need_finish_Punctuation(const char * i_sText); + void On_Default(const char * i_sText); + + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); + + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); + virtual UnoIDL_PE & MyPE(); void store_Interface(); // DATA - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; - E_State eState; + E_State eState; String sData_Name; - bool bIsPreDeclaration; + bool bIsPreDeclaration; ary::idl::Interface * pCurInterface; ary::idl::Ce_id nCurInterface; - Dyn<PE_Function> pPE_Function; - Dyn<PE_Attribute> pPE_Attribute; + Dyn<PE_Function> pPE_Function; + Dyn<PE_Attribute> pPE_Attribute; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Base; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Base; bool bOptionalMember; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx index 1c75d25203d1..88e101566034 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_modul.hxx @@ -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 @@ -49,10 +49,10 @@ class PE_Module : public ::ParseEnvironment { public: - virtual void Enter( - E_EnvStackAction i_eWayOfEntering ); - virtual void Leave( - E_EnvStackAction i_eWayOfLeaving ); + virtual void Enter( + E_EnvStackAction i_eWayOfEntering ); + virtual void Leave( + E_EnvStackAction i_eWayOfLeaving ); private: }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx index 15aa52b7c31a..7c3016304bf0 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_property.hxx @@ -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 @@ -62,29 +62,29 @@ class PE_Property : public UnoIDL_PE, PE_Property( const Ce_id & i_rCurOwner ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual ~PE_Property(); + virtual ~PE_Property(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); - void PresetOptional() { bIsOptional = true; } - void PresetStereotypes( + void PresetOptional() { bIsOptional = true; } + void PresetStereotypes( Stereotypes::E_Flags i_eFlag ) { aStereotypes.Set_Flag(i_eFlag); } @@ -97,21 +97,21 @@ class PE_Property : public UnoIDL_PE, in_variable }; - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA E_State eState; const Ce_id * pCurOwner; - Dyn<PE_Variable> pPE_Variable; + Dyn<PE_Variable> pPE_Variable; // object-data - Type_id nCurParsedType; - String sCurParsedName; - bool bIsOptional; + Type_id nCurParsedType; + String sCurParsedName; + bool bIsOptional; Stereotypes aStereotypes; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx index 54088fdbdd9c..ddb060c255a6 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_selem.hxx @@ -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 @@ -62,27 +62,27 @@ class PE_StructElement : public UnoIDL_PE, typedef ary::idl::Ce_id RStruct; PE_StructElement( /// Use for Struct-elements - RStructElement & o_rResult, - const RStruct & i_rCurStruct, + RStructElement & o_rResult, + const RStruct & i_rCurStruct, const String & i_rCurStructTemplateParam ); PE_StructElement( /// Use for Exception-elements - RStructElement & o_rResult, - const RStruct & i_rCurExc ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + RStructElement & o_rResult, + const RStruct & i_rCurExc ); + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_StructElement(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Default(); - virtual void Process_Identifier( + virtual void Process_Default(); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); @@ -95,20 +95,20 @@ class PE_StructElement : public UnoIDL_PE, expect_finish }; - virtual void InitData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); - ary::idl::Type_id lhf_FindTemplateParamType() const; + ary::idl::Type_id lhf_FindTemplateParamType() const; // DATA E_State eState; - RStructElement * pResult; - const RStruct * pCurStruct; + RStructElement * pResult; + const RStruct * pCurStruct; bool bIsExceptionElement; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nType; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nType; String sName; const String * pCurStructTemplateParam; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx index 691b97d5a432..c889e882a4c3 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_servi.hxx @@ -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 @@ -62,33 +62,33 @@ class PE_Service : public UnoIDL_PE, { public: PE_Service(); - virtual ~PE_Service(); + virtual ~PE_Service(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Identifier( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_Needs(); - virtual void Process_Observes(); - virtual void Process_Default(); + virtual void Process_Needs(); + virtual void Process_Observes(); + virtual void Process_Default(); private: - void On_Default(); + void On_Default(); enum E_State { @@ -109,32 +109,32 @@ class PE_Service : public UnoIDL_PE, e_STATES_MAX }; - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); + virtual UnoIDL_PE & MyPE(); - void StartProperty(); + void StartProperty(); // DATA - E_State eState; + E_State eState; String sData_Name; - bool bIsPreDeclaration; + bool bIsPreDeclaration; ary::idl::Service * pCurService; ary::idl::SglIfcService * pCurSiService; ary::idl::Ce_id nCurService; // Needed for PE_Attribute. - Dyn<PE_Property> pPE_Property; - ary::idl::Ce_id nCurParsed_Property; + Dyn<PE_Property> pPE_Property; + ary::idl::Ce_id nCurParsed_Property; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Type; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Type; - Dyn<PE_Function> pPE_Constructor; + Dyn<PE_Function> pPE_Constructor; - bool bOptionalMember; + bool bOptionalMember; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx index 5affacaa925e..9c38a8eda5c1 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_singl.hxx @@ -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 @@ -61,25 +61,25 @@ class PE_Singleton : public UnoIDL_PE, { public: PE_Singleton(); - virtual ~PE_Singleton(); + virtual ~PE_Singleton(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Identifier( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State @@ -94,26 +94,26 @@ class PE_Singleton : public UnoIDL_PE, e_STATES_MAX }; - void On_Default(); + void On_Default(); - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); + virtual UnoIDL_PE & MyPE(); // DATA -// static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; +// static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; - E_State eState; + E_State eState; String sData_Name; - bool bIsPreDeclaration; + bool bIsPreDeclaration; ary::idl::Singleton * pCurSingleton; ary::idl::SglIfcSingleton * pCurSiSingleton; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Type; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Type; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx index 3746d74e4144..6b7a5e16040f 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_struc.hxx @@ -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 @@ -68,38 +68,38 @@ class PE_Struct : public UnoIDL_PE { public: PE_Struct(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Struct(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); private: struct S_Work { S_Work(); - void InitData(); - void Prepare_PE_QualifiedName(); - void Prepare_PE_Element(); - void Data_Set_Name( - const char * i_sName ); - void Data_Set_TemplateParam( - const char * i_sTemplateParam ); + void InitData(); + void Prepare_PE_QualifiedName(); + void Prepare_PE_Element(); + void Data_Set_Name( + const char * i_sName ); + void Data_Set_TemplateParam( + const char * i_sTemplateParam ); String sData_Name; String sData_TemplateParam; - bool bIsPreDeclaration; - ary::idl::Ce_id nCurStruct; + bool bIsPreDeclaration; + ary::idl::Ce_id nCurStruct; Dyn<PE_StructElement> pPE_Element; - ary::idl::Ce_id nCurParsed_ElementRef; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nCurParsed_Base; + ary::idl::Ce_id nCurParsed_ElementRef; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nCurParsed_Base; }; struct S_Stati; @@ -114,70 +114,70 @@ class PE_Struct : public UnoIDL_PE protected: PE_StructState( - PE_Struct & i_rStruct ) - : rStruct(i_rStruct) {} - void MoveState( - ParseEnvState & i_rState ) const; - void SetResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push = 0 ) const + PE_Struct & i_rStruct ) + : rStruct(i_rStruct) {} + void MoveState( + ParseEnvState & i_rState ) const; + void SetResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push = 0 ) const { rStruct.SetResult(i_eDone, i_eWhat2DoWithEnvStack, i_pParseEnv2Push); } - S_Stati & Stati() const { return *rStruct.pStati; } - S_Work & Work() const { return rStruct.aWork; } - PE_Struct & PE() const { return rStruct; } + S_Stati & Stati() const { return *rStruct.pStati; } + S_Work & Work() const { return rStruct.aWork; } + PE_Struct & PE() const { return rStruct; } private: - virtual UnoIDL_PE & MyPE(); + virtual UnoIDL_PE & MyPE(); // DATA - PE_Struct & rStruct; + PE_Struct & rStruct; }; class State_None : public PE_StructState { public: State_None( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} }; class State_WaitForName : public PE_StructState - { // -> Name + { // -> Name public: State_WaitForName( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); }; class State_GotName : public PE_StructState - { // -> : { ; < + { // -> : { ; < public: State_GotName( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; class State_WaitForTemplateParam : public PE_StructState - { // -> Template parameter identifier + { // -> Template parameter identifier public: State_WaitForTemplateParam( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); }; class State_WaitForTemplateEnd : public PE_StructState - { // -> > + { // -> > public: State_WaitForTemplateEnd( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -185,17 +185,17 @@ class PE_Struct : public UnoIDL_PE { // -> Base public: State_WaitForBase( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void On_SubPE_Left(); + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void On_SubPE_Left(); }; class State_GotBase : public PE_StructState { // -> { public: State_GotBase( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -203,19 +203,19 @@ class PE_Struct : public UnoIDL_PE { // -> Typ } public: State_WaitForElement( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Identifier( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_BuiltInType( + virtual void Process_NameSeparator(); + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -223,9 +223,9 @@ class PE_Struct : public UnoIDL_PE { // -> ; public: State_WaitForFinish( - PE_Struct & i_rStruct ) - : PE_StructState(i_rStruct) {} - virtual void Process_Punctuation( + PE_Struct & i_rStruct ) + : PE_StructState(i_rStruct) {} + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); }; @@ -233,13 +233,13 @@ class PE_Struct : public UnoIDL_PE struct S_Stati { S_Stati( - PE_Struct & io_rStruct ); - void SetState( - ParseEnvState & i_rNextState ) + PE_Struct & io_rStruct ); + void SetState( + ParseEnvState & i_rNextState ) { pCurStatus = &i_rNextState; } - State_None aNone; - State_WaitForName aWaitForName; + State_None aNone; + State_WaitForName aWaitForName; State_GotName aGotName; State_WaitForTemplateParam aWaitForTemplateParam; @@ -251,12 +251,12 @@ class PE_Struct : public UnoIDL_PE aWaitForElement; State_WaitForFinish aWaitForFinish; - ParseEnvState * pCurStatus; + ParseEnvState * pCurStatus; }; - virtual void InitData(); - virtual void TransferData(); - virtual void ReceiveData(); + virtual void InitData(); + virtual void TransferData(); + virtual void ReceiveData(); public: @@ -264,18 +264,18 @@ class PE_Struct : public UnoIDL_PE private: - S_Stati & Stati() { return *pStati; } - S_Work & Work() { return aWork; } + S_Stati & Stati() { return *pStati; } + S_Work & Work() { return aWork; } // DATA - S_Work aWork; - Dyn<S_Stati> pStati; + S_Work aWork; + Dyn<S_Stati> pStati; }; inline void PE_Struct::PE_StructState::MoveState( - ParseEnvState & i_rState ) const + ParseEnvState & i_rState ) const { rStruct.Stati().SetState(i_rState); } } // namespace uidl diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx index ea8228fecbae..261715239caa 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_tydf2.hxx @@ -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 @@ -54,23 +54,23 @@ class PE_Typedef : public UnoIDL_PE, { public: PE_Typedef(); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, - ary::Repository & io_rRepository, + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, + ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); ~PE_Typedef(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State @@ -81,7 +81,7 @@ class PE_Typedef : public UnoIDL_PE, got_name, e_STATES_MAX }; - enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. + enum E_TokenType /// @ATTENTION Do not change existing values (except of tt_MAX) !!! Else array-indices will break. { tt_any = 0, tt_identifier, @@ -91,27 +91,27 @@ class PE_Typedef : public UnoIDL_PE, typedef void (PE_Typedef::*F_TOK)(const char *); - void CallHandler( - const char * i_sTokenText, - E_TokenType i_eTokenType ); + void CallHandler( + const char * i_sTokenText, + E_TokenType i_eTokenType ); - void On_expect_description_Any(const char * i_sText); - void On_expect_name_Identifier(const char * i_sText); - void On_got_name_Punctuation(const char * i_sText); - void On_Default(const char * ); + void On_expect_description_Any(const char * i_sText); + void On_expect_name_Identifier(const char * i_sText); + void On_got_name_Punctuation(const char * i_sText); + void On_Default(const char * ); - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA - static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; + static F_TOK aDispatcher[e_STATES_MAX][tt_MAX]; E_State eState; - Dyn<PE_Type> pPE_Type; - ary::idl::Type_id nType; - String sName; + Dyn<PE_Type> pPE_Type; + ary::idl::Type_id nType; + String sName; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx index 2d6367528672..020c846fa9fe 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_type2.hxx @@ -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 @@ -51,26 +51,26 @@ class PE_Type : public UnoIDL_PE, { public: PE_Type( - ary::idl::Type_id & o_rResult ); + ary::idl::Type_id & o_rResult ); virtual ~PE_Type(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_Punctuation( + virtual void Process_NameSeparator(); + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_Default(); + virtual void Process_Default(); private: enum E_State @@ -82,23 +82,23 @@ class PE_Type : public UnoIDL_PE, in_template_type }; - void Finish(); + void Finish(); PE_Type & MyTemplateType(); - virtual void InitData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA ary::idl::Type_id * pResult; - uintt nIsSequenceCounter; - uintt nSequenceDownCounter; - bool bIsUnsigned; - ary::QualifiedName sFullType; + uintt nIsSequenceCounter; + uintt nSequenceDownCounter; + bool bIsUnsigned; + ary::QualifiedName sFullType; - E_State eState; - String sLastPart; + E_State eState; + String sLastPart; Dyn<PE_Type> pPE_TemplateType; /// @attention Recursion, only initiate, if needed! ary::idl::Type_id nTemplateType; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx index 961539c57abd..58a7bc22cc86 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pe_vari2.hxx @@ -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 @@ -53,27 +53,27 @@ class PE_Variable : public UnoIDL_PE, { public: PE_Variable( - ary::idl::Type_id & i_rResult_Type, - String & i_rResult_Name ); - virtual void EstablishContacts( - UnoIDL_PE * io_pParentPE, + ary::idl::Type_id & i_rResult_Type, + String & i_rResult_Name ); + virtual void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::Repository & io_rRepository, TokenProcessing_Result & o_rResult ); - virtual ~PE_Variable(); + virtual ~PE_Variable(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - virtual void Process_Default(); - virtual void Process_Identifier( + virtual void Process_Default(); + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_Punctuation( + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); private: @@ -85,17 +85,17 @@ class PE_Variable : public UnoIDL_PE, expect_finish }; - virtual void InitData(); - virtual void ReceiveData(); - virtual void TransferData(); - virtual UnoIDL_PE & MyPE(); + virtual void InitData(); + virtual void ReceiveData(); + virtual void TransferData(); + virtual UnoIDL_PE & MyPE(); // DATA E_State eState; - ary::idl::Type_id * pResult_Type; - String * pResult_Name; + ary::idl::Type_id * pResult_Type; + String * pResult_Name; - Dyn<PE_Type> pPE_Type; + Dyn<PE_Type> pPE_Type; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx b/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx index 78582ab0abae..26d03df6aecd 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/pestate.hxx @@ -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 @@ -49,50 +49,50 @@ class TokBuiltInType; class TokPunctuation; class Tok_Documentation; -class ParseEnvState : public TokenInterpreter, +class ParseEnvState : public TokenInterpreter, virtual protected TokenProcessing_Types { public: - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ); - virtual void Process_NameSeparator(); - virtual void Process_Punctuation( + virtual void Process_NameSeparator(); + virtual void Process_Punctuation( const TokPunctuation & i_rToken ); - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ); - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ); - virtual void Process_MetaType( - const TokMetaType & i_rToken ); - virtual void Process_Stereotype( + virtual void Process_MetaType( + const TokMetaType & i_rToken ); + virtual void Process_Stereotype( const TokStereotype & i_rToken ); - virtual void Process_ParameterHandling( + virtual void Process_ParameterHandling( const TokParameterHandling & i_rToken ); - virtual void Process_Raises(); - virtual void Process_Needs(); - virtual void Process_Observes(); - virtual void Process_Assignment( + virtual void Process_Raises(); + virtual void Process_Needs(); + virtual void Process_Observes(); + virtual void Process_Assignment( const TokAssignment & i_rToken ); - virtual void Process_EOL(); + virtual void Process_EOL(); - virtual void On_SubPE_Left(); + virtual void On_SubPE_Left(); - virtual void Process_Default(); + virtual void Process_Default(); protected: - ParseEnvState() : bDefaultIsError(true) {} - void SetDefault2Ignore() { bDefaultIsError = false; } + ParseEnvState() : bDefaultIsError(true) {} + void SetDefault2Ignore() { bDefaultIsError = false; } private: - virtual UnoIDL_PE & MyPE() = 0; - bool bDefaultIsError; + virtual UnoIDL_PE & MyPE() = 0; + bool bDefaultIsError; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx b/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx index 75c8fdf4bdce..65f18a6c192e 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/semnode.hxx @@ -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 @@ -63,32 +63,32 @@ class Struct; class Token; -/** is an implementation class for UnoIDL_PE s +/** is an implementation class for UnoIDL_PE s */ class SemanticNode : private TokenProcessing_Types { public: SemanticNode(); - void EstablishContacts( - UnoIDL_PE * io_pParentPE, + void EstablishContacts( + UnoIDL_PE * io_pParentPE, ary::idl::Gate & io_rRepository, TokenProcessing_Result & o_rResult ); ~SemanticNode(); - void SetTokenResult( - E_TokenDone i_eDone, - E_EnvStackAction i_eWhat2DoWithEnvStack, - UnoIDL_PE * i_pParseEnv2Push = 0 ); - UnoIDL_PE * Parent() const { return pParentPE; } - ary::idl::Gate & AryGate() const { return *pAryGate; } + void SetTokenResult( + E_TokenDone i_eDone, + E_EnvStackAction i_eWhat2DoWithEnvStack, + UnoIDL_PE * i_pParseEnv2Push = 0 ); + UnoIDL_PE * Parent() const { return pParentPE; } + ary::idl::Gate & AryGate() const { return *pAryGate; } TokenProcessing_Result & TokenResult() const { return *pTokenResult; } private: // DATA - UnoIDL_PE * pParentPE; - ary::idl::Gate * pAryGate; + UnoIDL_PE * pParentPE; + ary::idl::Gate * pAryGate; TokenProcessing_Result * pTokenResult; }; @@ -98,26 +98,26 @@ class SemanticNode : private TokenProcessing_Types class Trying_PE { public: - virtual ~Trying_PE() {} + virtual ~Trying_PE() {} protected: Trying_PE(); - virtual void ProcessToken( - const Token & i_rToken ); + virtual void ProcessToken( + const Token & i_rToken ); - void StartTry( - UnoIDL_PE & i_rFirstTry ); - void Add2Try( - UnoIDL_PE & i_rTry ); - bool AmITrying() const; - UnoIDL_PE * NextTry() const; - void FinishTry(); + void StartTry( + UnoIDL_PE & i_rFirstTry ); + void Add2Try( + UnoIDL_PE & i_rTry ); + bool AmITrying() const; + UnoIDL_PE * NextTry() const; + void FinishTry(); private: std::vector<UnoIDL_PE*> aTryableSubEnvironments; - uintt nTryCounter; + uintt nTryCounter; }; */ diff --git a/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx index c29f7297c181..ebdd7326c48a 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/smp_uidl.hxx @@ -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 @@ -45,27 +45,27 @@ namespace uidl -/** is an implementation class for ParseEnvironment +/** is an implementation class for ParseEnvironment */ class SemanticParser : public csi::uidl::Token_Receiver, public csi::dsapi::Token_Receiver { public: - typedef std::deque< DYN TextToken * > TokenQueue; + typedef std::deque< DYN TextToken * > TokenQueue; ~SemanticParser(); - void Receive( + void Receive( DYN csi::uidl::Token & let_drToken ); - void Receive( + void Receive( DYN csi::dsapi::Token & let_drToken ); private: // DATA - TokenQueue aTokenQueue; + TokenQueue aTokenQueue; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx index e423a8130b0d..36e03a1e60fc 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_const.hxx @@ -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 @@ -45,16 +45,16 @@ class TokAssignment : public Token { public: TokAssignment( - const char * i_sText ) - : sText(i_sText) {} + const char * i_sText ) + : sText(i_sText) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; private: // DATA - String sText; + String sText; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx index 1abc3cf77a46..c7345c2410c1 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_ident.hxx @@ -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 @@ -46,23 +46,23 @@ class TokIdentifier : public Token { public: TokIdentifier( - const char * i_sText ) - : sText(i_sText) {} + const char * i_sText ) + : sText(i_sText) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; private: // DATA - String sText; + String sText; }; class TokNameSeparator : public Token { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx index ac0120c7582d..a250a5dda485 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_keyw.hxx @@ -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 @@ -69,18 +69,18 @@ class TokBuiltInType : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokBuiltInType( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; @@ -96,17 +96,17 @@ class TokTypeModifier : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokTypeModifier( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + EV_TokenId i_eTag ) + : eTag(i_eTag) {} + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class TokMetaType : public TokKeyword @@ -132,19 +132,19 @@ class TokMetaType : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokMetaType( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class TokStereotype : public TokKeyword @@ -172,19 +172,19 @@ class TokStereotype : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokStereotype( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class TokParameterHandling : public TokKeyword @@ -201,26 +201,26 @@ class TokParameterHandling : public TokKeyword typedef lux::Enum<E_TokenId> EV_TokenId; TokParameterHandling( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; - E_TokenId Id() const { return eTag; } + E_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class TokRaises : public TokKeyword { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; @@ -228,8 +228,8 @@ class TokRaises : public TokKeyword class TokNeeds : public TokKeyword { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; @@ -237,8 +237,8 @@ class TokNeeds : public TokKeyword class TokObserves : public TokKeyword { public: - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; virtual const char * Text() const; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx index 043256ef27e5..9bb2d48b2847 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tk_punct.hxx @@ -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 @@ -50,13 +50,13 @@ class TokPunctuation : public Token enum E_TokenId { e_none = 0, - BracketOpen = 1, // ( + BracketOpen = 1, // ( BracketClose = 2, // ) ArrayBracketOpen = 3, // [ ArrayBracketClose = 4, // ] CurledBracketOpen = 5, // { CurledBracketClose = 6, // } - Semicolon = 7, // ; + Semicolon = 7, // ; Colon = 8, // : DoubleColon = 9, // :: Comma = 10, // , @@ -69,27 +69,27 @@ class TokPunctuation : public Token TokPunctuation( - EV_TokenId i_eTag ) - : eTag(i_eTag) {} + EV_TokenId i_eTag ) + : eTag(i_eTag) {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; - EV_TokenId Id() const { return eTag; } + EV_TokenId Id() const { return eTag; } private: // DATA - EV_TokenId eTag; + EV_TokenId eTag; }; class Tok_EOL : public Token { // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; @@ -98,8 +98,8 @@ class Tok_EOL : public Token class Tok_EOF : public Token { // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const; // INQUIRY virtual const char * Text() const; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx index 02c35e2fd871..50d2b4f5d5ba 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tkp_uidl.hxx @@ -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 @@ -57,19 +57,19 @@ class TokenParser_Uidl : public TokenParse2 public: // LIFECYCLE TokenParser_Uidl( - Token_Receiver & o_rUidlReceiver, + Token_Receiver & o_rUidlReceiver, DYN TkpDocuContext & let_drDocuContext ); - virtual ~TokenParser_Uidl(); + virtual ~TokenParser_Uidl(); // OPERATIONS private: virtual ::TkpContext & CurrentContext(); - virtual void SetStartContext(); + virtual void SetStartContext(); virtual void SetCurrentContext( - TkpContext & io_rContext ); + TkpContext & io_rContext ); // DATA Dyn<Context_UidlCode> pBaseContext; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx index fcfd1972ce1b..340ee0b7c5bf 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tokintpr.hxx @@ -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 @@ -56,36 +56,36 @@ class Tok_Documentation; class TokenInterpreter { public: - virtual ~TokenInterpreter() {} + virtual ~TokenInterpreter() {} - virtual void Process_Identifier( + virtual void Process_Identifier( const TokIdentifier & i_rToken ) = 0; - virtual void Process_NameSeparator() = 0; // :: - virtual void Process_Punctuation( + virtual void Process_NameSeparator() = 0; // :: + virtual void Process_Punctuation( const TokPunctuation & i_rToken ) = 0; - virtual void Process_BuiltInType( + virtual void Process_BuiltInType( const TokBuiltInType & i_rToken ) = 0; - virtual void Process_TypeModifier( + virtual void Process_TypeModifier( const TokTypeModifier & i_rToken ) = 0; - virtual void Process_MetaType( - const TokMetaType & i_rToken ) = 0; - virtual void Process_Stereotype( + virtual void Process_MetaType( + const TokMetaType & i_rToken ) = 0; + virtual void Process_Stereotype( const TokStereotype & i_rToken ) = 0; - virtual void Process_ParameterHandling( + virtual void Process_ParameterHandling( const TokParameterHandling & i_rToken ) = 0; - virtual void Process_Raises() = 0; - virtual void Process_Needs() = 0; - virtual void Process_Observes() = 0; - virtual void Process_Assignment( + virtual void Process_Raises() = 0; + virtual void Process_Needs() = 0; + virtual void Process_Observes() = 0; + virtual void Process_Assignment( const TokAssignment & i_rToken ) = 0; - virtual void Process_EOL() = 0; + virtual void Process_EOL() = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx index 0afae87c52b7..ccacd3e6f371 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tokproct.hxx @@ -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 @@ -46,7 +46,7 @@ namespace uidl class UnoIDL_PE; -/** is a parent class for classes, which take part in parsing tokens semantically. +/** is a parent class for classes, which take part in parsing tokens semantically. It provides some types for them. */ class TokenProcessing_Types @@ -60,7 +60,7 @@ class TokenProcessing_Types enum E_EnvStackAction { - stay, // same parse environment + stay, // same parse environment push_sure, // push sub environment, which must be the correct one push_try, // push sub environment, which is tried, if it may be the right one pop_success, // return to parent environment, parsing was successful @@ -69,13 +69,13 @@ class TokenProcessing_Types struct TokenProcessing_Result { - E_TokenDone eDone; - E_EnvStackAction eStackAction; - UnoIDL_PE * pEnv2Push; + E_TokenDone eDone; + E_EnvStackAction eStackAction; + UnoIDL_PE * pEnv2Push; TokenProcessing_Result() : eDone(not_done), eStackAction(stay), pEnv2Push(0) {} - void reset() { eDone = not_done; eStackAction = stay; pEnv2Push = 0; } + void reset() { eDone = not_done; eStackAction = stay; pEnv2Push = 0; } }; enum E_ParseResult diff --git a/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx index f1d43dd5a435..033ff8da04b4 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/tokrecv.hxx @@ -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 @@ -48,9 +48,9 @@ class Token; class Token_Receiver { public: - virtual ~Token_Receiver() {} - virtual void Receive( - DYN Token & let_drToken ) = 0; + virtual ~Token_Receiver() {} + virtual void Receive( + DYN Token & let_drToken ) = 0; virtual void Increment_CurLine() = 0; }; diff --git a/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx b/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx index a316582b381b..82f2b4b92042 100644 --- a/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx +++ b/autodoc/source/parser_i/inc/s2_luidl/uidl_tok.hxx @@ -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 @@ -50,11 +50,11 @@ class Token : public TextToken { public: // LIFECYCLE - virtual ~Token() {} + virtual ~Token() {} // OPERATIONS - virtual void Trigger( - TokenInterpreter & io_rInterpreter ) const = 0; + virtual void Trigger( + TokenInterpreter & io_rInterpreter ) const = 0; }; } // namespace uidl diff --git a/autodoc/source/parser_i/inc/semantic/parsenv2.hxx b/autodoc/source/parser_i/inc/semantic/parsenv2.hxx index 75facea675ce..16b4af226f02 100644 --- a/autodoc/source/parser_i/inc/semantic/parsenv2.hxx +++ b/autodoc/source/parser_i/inc/semantic/parsenv2.hxx @@ -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 @@ -42,9 +42,9 @@ class ParseEnvironment { public: - virtual ~ParseEnvironment(); + virtual ~ParseEnvironment(); - virtual void Enter() = 0; + virtual void Enter() = 0; }; diff --git a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx index 1555cde5e0d6..e16e4fbdbc29 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstar2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstar2.hxx @@ -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 @@ -42,32 +42,32 @@ class StmArrayStatu2 : public StmStatu2 public: // LIFECYCLE StmArrayStatu2( - intt i_nStatusSize, - const INT16 * in_aArrayModel, - uintt i_nTokenId, - bool in_bIsDefault ); + intt i_nStatusSize, + const INT16 * in_aArrayModel, + uintt i_nTokenId, + bool in_bIsDefault ); ~StmArrayStatu2(); // INQUIRY - StmStatu2::Branch NextBy( - intt in_nFollowersIndex) const; - UINT16 TokenId() const { return nTokenId; } - virtual bool IsADefault() const; + StmStatu2::Branch NextBy( + intt in_nFollowersIndex) const; + UINT16 TokenId() const { return nTokenId; } + virtual bool IsADefault() const; // ACCESS virtual StmArrayStatu2 * AsArray(); - bool SetBranch( - intt in_nBranchIx, + bool SetBranch( + intt in_nBranchIx, StmStatu2::Branch in_nBranch ); - void SetTokenId( - UINT16 in_nTokenId ); + void SetTokenId( + UINT16 in_nTokenId ); private: - StmStatu2::Branch * dpBranches; - intt nNrOfBranches; - UINT16 nTokenId; - bool bIsADefault; + StmStatu2::Branch * dpBranches; + intt nNrOfBranches; + UINT16 nTokenId; + bool bIsADefault; }; diff --git a/autodoc/source/parser_i/inc/tokens/stmstat2.hxx b/autodoc/source/parser_i/inc/tokens/stmstat2.hxx index 3d83bb0f77fb..4602da49c59c 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstat2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstat2.hxx @@ -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 @@ -36,21 +36,21 @@ class StmArrayStatu2; class StmBoundsStatu2; -/** A StmStatu2 is a state within a StateMachin2. +/** A StmStatu2 is a state within a StateMachin2. There are two kinds of it. Either its an array of pointers to other states within the state machine - an ArrayStatus. Or it is a BoundsStatus, which shows, the token cannot be followed further within the StateMachin2. **/ -class StmStatu2 // := "State machine status" +class StmStatu2 // := "State machine status" { public: - typedef intt Branch; /// Values >= 0 give a next #Status' ID. + typedef intt Branch; /// Values >= 0 give a next #Status' ID. /// Values <= 0 tell, that a token is finished. /// a value < 0 returns the status back to an upper level state machine. // LIFECYCLE - virtual ~StmStatu2() {} + virtual ~StmStatu2() {} // OPERATIONS virtual StmArrayStatu2 * @@ -59,7 +59,7 @@ class StmStatu2 // := "State machine status" AsBounds(); // INQUIRY - virtual bool IsADefault() const = 0; + virtual bool IsADefault() const = 0; }; diff --git a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx index d5550752e6a3..b7b38d608573 100644 --- a/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx +++ b/autodoc/source/parser_i/inc/tokens/stmstfi2.hxx @@ -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 @@ -48,13 +48,13 @@ class StmBoundsStatu2 : public StmStatu2 StmBoundsStatu2( StateMachineContext & o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ); + TkpContext & i_rFollowUpContext, + uintt i_nStatusFunctionNr, + bool i_bIsDefault ); // INQUIRY - TkpContext * FollowUpContext(); - uintt StatusFunctionNr() const; - virtual bool IsADefault() const; + TkpContext * FollowUpContext(); + uintt StatusFunctionNr() const; + virtual bool IsADefault() const; // ACCESS virtual StmBoundsStatu2 * @@ -63,9 +63,9 @@ class StmBoundsStatu2 : public StmStatu2 private: StateMachineContext * pOwner; - TkpContext * pFollowUpContext; - uintt nStatusFunctionNr; - bool bIsDefault; + TkpContext * pFollowUpContext; + uintt nStatusFunctionNr; + bool bIsDefault; }; inline TkpContext * diff --git a/autodoc/source/parser_i/inc/tokens/tkp2.hxx b/autodoc/source/parser_i/inc/tokens/tkp2.hxx index faf45d8e5332..f5d9839361de 100644 --- a/autodoc/source/parser_i/inc/tokens/tkp2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkp2.hxx @@ -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 @@ -54,29 +54,29 @@ class TokenParse2 public: // LIFECYCLE TokenParse2(); - virtual ~TokenParse2() {} + virtual ~TokenParse2() {} // OPERATIONS - virtual void Start( + virtual void Start( CharacterSource & i_rSource ); - /** @short Gets the next identifiable token out of the + /** @short Gets the next identifiable token out of the source code. @return true, if there was passed a valid token. false, if the parsed stream is finished or - an error occured. + an error occured. */ - bool GetNextToken(); + bool GetNextToken(); private: - virtual void SetStartContext() = 0; + virtual void SetStartContext() = 0; virtual void SetCurrentContext( - TkpContext & io_rContext ) = 0; + TkpContext & io_rContext ) = 0; virtual TkpContext & CurrentContext() = 0; // DATA - CharacterSource * pChars; + CharacterSource * pChars; }; diff --git a/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx b/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx index fc7991ae1832..2246385b09fc 100644 --- a/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkpcont2.hxx @@ -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 @@ -37,7 +37,7 @@ class CharacterSource; class TkpNullContext; class TkpNullContex2; -/** @task +/** @task Specifies a context within which tokens are interpreted in a special way. For example in parsing C++ there could be a context for code, one for comments and a third one for preprocessor statements, because @@ -47,7 +47,7 @@ class TkpContext { public: // LIFECYCLE - virtual ~TkpContext() {} + virtual ~TkpContext() {} // OPERATIONS /** @descr @@ -67,13 +67,13 @@ class TkpContext passes the parsed token to the internally known receiver and returns true. The token is cut from io_rText. **/ - virtual void ReadCharChain( - CharacterSource & io_rText ) = 0; + virtual void ReadCharChain( + CharacterSource & io_rText ) = 0; /** Has to pass the parsed token to a known receiver. @return true, if a token was passed. false, if no token was parsed complete by this context. */ - virtual bool PassNewToken() = 0; + virtual bool PassNewToken() = 0; virtual TkpContext & FollowUpContext() = 0; @@ -89,10 +89,10 @@ class StateMachineContext virtual ~StateMachineContext() {} /// Is used by StmBoundsStatu2 only. - virtual void PerformStatusFunction( - uintt i_nStatusSignal, - UINT16 i_nTokenId, - CharacterSource & io_rText ) = 0; + virtual void PerformStatusFunction( + uintt i_nStatusSignal, + UINT16 i_nTokenId, + CharacterSource & io_rText ) = 0; }; class TkpNullContex2 : public TkpContext @@ -100,9 +100,9 @@ class TkpNullContex2 : public TkpContext public: ~TkpNullContex2(); - virtual void ReadCharChain( - CharacterSource & io_rText ); - virtual bool PassNewToken(); + virtual void ReadCharChain( + CharacterSource & io_rText ); + virtual bool PassNewToken(); virtual TkpContext & FollowUpContext(); }; @@ -110,11 +110,11 @@ class TkpNullContex2 : public TkpContext class TkpDocuContext : public TkpContext { public: - virtual void SetParentContext( - TkpContext & io_rParentContext, - const char * i_sMultiLineEndToken ) = 0; - virtual void SetMode_IsMultiLine( - bool i_bTrue ) = 0; + virtual void SetParentContext( + TkpContext & io_rParentContext, + const char * i_sMultiLineEndToken ) = 0; + virtual void SetMode_IsMultiLine( + bool i_bTrue ) = 0; }; diff --git a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx index a23da72f2c1e..635f696bf5d0 100644 --- a/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx +++ b/autodoc/source/parser_i/inc/tokens/tkpstam2.hxx @@ -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 @@ -36,7 +36,7 @@ #include <tokens/stmstar2.hxx> #include <tokens/stmstfi2.hxx> -/** @descr +/** @descr This state-machine models state transitions from one state to another per indices of branches. If the indices represent ascii-char-values, the state-machine can be used for recognising tokens of text. @@ -52,62 +52,62 @@ class StateMachin2 { public: // Types - typedef StmStatu2::Branch Branch; - typedef StmStatu2 * * StatusList; + typedef StmStatu2::Branch Branch; + typedef StmStatu2 * * StatusList; //# Interface self // LIFECYCLE StateMachin2( - intt in_nStatusSize, - intt in_nInitial_StatusListSize ); /// The user of the constructor should guess + intt in_nStatusSize, + intt in_nInitial_StatusListSize ); /// The user of the constructor should guess /// the approximate number of stati here to - /// avoid multiple reallocations. + /// avoid multiple reallocations. /// @#AddStatus - intt AddStatus( /// @return the new #Status' ID - DYN StmStatu2 * let_dpStatus); + intt AddStatus( /// @return the new #Status' ID + DYN StmStatu2 * let_dpStatus); /// @#AddToken - void AddToken( - const char * in_sToken, - UINT16 in_nTokenId, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ); + void AddToken( + const char * in_sToken, + UINT16 in_nTokenId, + const INT16 * in_aBranches, + INT16 in_nBoundsStatus ); ~StateMachin2(); // OPERATIONS StmBoundsStatu2 & GetCharChain( - UINT16 & o_nTokenId, - CharacterSource & io_rText ); + UINT16 & o_nTokenId, + CharacterSource & io_rText ); private: // SERVICE FUNCTIONS - StmStatu2 & Status( - intt in_nStatusNr) const; + StmStatu2 & Status( + intt in_nStatusNr) const; StmArrayStatu2 & CurrentStatus() const; StmBoundsStatu2 * BoundsStatus() const; /// Sets the PeekedStatus. - void Peek( - intt in_nBranch); + void Peek( + intt in_nBranch); - void ResizeStati(); // Adds space for 32 stati. + void ResizeStati(); // Adds space for 32 stati. // DATA - StatusList pStati; /// List of Status, implemented as simple C-array of length #nStatiSpace + StatusList pStati; /// List of Status, implemented as simple C-array of length #nStatiSpace /// with nStatiLength valid members (beginning from zero). - intt nCurrentStatus; - intt nPeekedStatus; + intt nCurrentStatus; + intt nPeekedStatus; - intt nStatusSize; /// Size of the branch array of a single status. + intt nStatusSize; /// Size of the branch array of a single status. - intt nNrofStati; /// Nr of Stati so far. - intt nStatiSpace; /// Size of allocated array for #pStati (size in items). + intt nNrofStati; /// Nr of Stati so far. + intt nStatiSpace; /// Size of allocated array for #pStati (size in items). }; -/** @#AddToken +/** @#AddToken @descr Adds a token, which will be recogniszeds by the statemachine. diff --git a/autodoc/source/parser_i/inc/tokens/token2.hxx b/autodoc/source/parser_i/inc/tokens/token2.hxx index d1a4ac3b275c..1e6750c48359 100644 --- a/autodoc/source/parser_i/inc/tokens/token2.hxx +++ b/autodoc/source/parser_i/inc/tokens/token2.hxx @@ -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 @@ -51,11 +51,11 @@ class TextToken { public: // LIFECYCLE - virtual ~TextToken() {} + virtual ~TextToken() {} // INQUIRY - virtual const char* Text() const = 0; + virtual const char* Text() const = 0; }; diff --git a/autodoc/source/parser_i/inc/x_parse2.hxx b/autodoc/source/parser_i/inc/x_parse2.hxx index 0301dc74f5a4..bbc69bb99239 100644 --- a/autodoc/source/parser_i/inc/x_parse2.hxx +++ b/autodoc/source/parser_i/inc/x_parse2.hxx @@ -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 @@ -42,22 +42,22 @@ class X_AutodocParser : public csv::Exception // TYPES enum E_Type { - x_Any = 0, + x_Any = 0, x_InvalidChar, x_UnexpectedToken, x_UnexpectedEOF }; // LIFECYCLE X_AutodocParser( - E_Type i_eType, - const char * i_sName = "" ) - : eType(i_eType), sName(i_sName) {} + E_Type i_eType, + const char * i_sName = "" ) + : eType(i_eType), sName(i_sName) {} // INQUIRY - virtual void GetInfo( + virtual void GetInfo( std::ostream & o_rOutputMedium ) const; private: - E_Type eType; + E_Type eType; String sName; }; diff --git a/autodoc/source/parser_i/tokens/stmstar2.cxx b/autodoc/source/parser_i/tokens/stmstar2.cxx index 1cc135fa63e1..f8894451d46d 100644 --- a/autodoc/source/parser_i/tokens/stmstar2.cxx +++ b/autodoc/source/parser_i/tokens/stmstar2.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 @@ -35,11 +35,11 @@ -StmArrayStatu2::StmArrayStatu2( intt i_nStatusSize, - const INT16 * in_aArrayModel, - uintt i_nTokenId, - bool in_bIsDefault ) - : dpBranches(new StmStatu2::Branch[i_nStatusSize]), +StmArrayStatu2::StmArrayStatu2( intt i_nStatusSize, + const INT16 * in_aArrayModel, + uintt i_nTokenId, + bool in_bIsDefault ) + : dpBranches(new StmStatu2::Branch[i_nStatusSize]), nNrOfBranches(i_nStatusSize), nTokenId(UINT16(i_nTokenId)), bIsADefault(in_bIsDefault) @@ -65,7 +65,7 @@ StmArrayStatu2::~StmArrayStatu2() } bool -StmArrayStatu2::SetBranch( intt in_nBranchIx, +StmArrayStatu2::SetBranch( intt in_nBranchIx, StmStatu2::Branch in_nBranch ) { if ( csv::in_range(intt(0), in_nBranchIx, intt(nNrOfBranches) ) ) @@ -84,7 +84,7 @@ StmArrayStatu2::NextBy(intt in_nIndex) const throw X_AutodocParser(X_AutodocParser::x_InvalidChar); return in_nIndex < nNrOfBranches - ? dpBranches[in_nIndex] + ? dpBranches[in_nIndex] : dpBranches[nNrOfBranches - 1]; } @@ -96,7 +96,7 @@ StmArrayStatu2::IsADefault() const } StmArrayStatu2 * -StmArrayStatu2::AsArray() +StmArrayStatu2::AsArray() { return this; } diff --git a/autodoc/source/parser_i/tokens/stmstat2.cxx b/autodoc/source/parser_i/tokens/stmstat2.cxx index 4d0cf62c4ed2..701bfa33c0e5 100644 --- a/autodoc/source/parser_i/tokens/stmstat2.cxx +++ b/autodoc/source/parser_i/tokens/stmstat2.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 diff --git a/autodoc/source/parser_i/tokens/stmstfi2.cxx b/autodoc/source/parser_i/tokens/stmstfi2.cxx index 15bffb0bf937..528011900332 100644 --- a/autodoc/source/parser_i/tokens/stmstfi2.cxx +++ b/autodoc/source/parser_i/tokens/stmstfi2.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 @@ -36,10 +36,10 @@ StmBoundsStatu2::StmBoundsStatu2( StateMachineContext & o_rOwner, - TkpContext & i_rFollowUpContext, - uintt i_nStatusFunctionNr, - bool i_bIsDefault ) - : pOwner(&o_rOwner), + TkpContext & i_rFollowUpContext, + uintt i_nStatusFunctionNr, + bool i_bIsDefault ) + : pOwner(&o_rOwner), pFollowUpContext(&i_rFollowUpContext), nStatusFunctionNr(i_nStatusFunctionNr), bIsDefault(i_bIsDefault) diff --git a/autodoc/source/parser_i/tokens/tkp2.cxx b/autodoc/source/parser_i/tokens/tkp2.cxx index 58f740d871e0..950215019bb3 100644 --- a/autodoc/source/parser_i/tokens/tkp2.cxx +++ b/autodoc/source/parser_i/tokens/tkp2.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 @@ -34,7 +34,7 @@ #include <tokens/tkpcont2.hxx> TokenParse2::TokenParse2() - : pChars(0) + : pChars(0) { } diff --git a/autodoc/source/parser_i/tokens/tkpcont2.cxx b/autodoc/source/parser_i/tokens/tkpcont2.cxx index 4ccef4df4b12..73c93c5eaf55 100644 --- a/autodoc/source/parser_i/tokens/tkpcont2.cxx +++ b/autodoc/source/parser_i/tokens/tkpcont2.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 diff --git a/autodoc/source/parser_i/tokens/tkpstam2.cxx b/autodoc/source/parser_i/tokens/tkpstam2.cxx index 90978c10ae2b..39cf31e1a395 100644 --- a/autodoc/source/parser_i/tokens/tkpstam2.cxx +++ b/autodoc/source/parser_i/tokens/tkpstam2.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 @@ -34,12 +34,12 @@ #include <tools/tkpchars.hxx> -const intt C_nStatuslistResizeValue = 32; -const intt C_nTopStatus = 0; +const intt C_nStatuslistResizeValue = 32; +const intt C_nTopStatus = 0; -StateMachin2::StateMachin2( intt in_nStatusSize, - intt in_nInitial_StatusListSize ) - : pStati(new StmStatu2*[in_nInitial_StatusListSize]), +StateMachin2::StateMachin2( intt in_nStatusSize, + intt in_nInitial_StatusListSize ) + : pStati(new StmStatu2*[in_nInitial_StatusListSize]), nCurrentStatus(C_nTopStatus), nPeekedStatus(C_nTopStatus), nStatusSize(in_nStatusSize), @@ -64,10 +64,10 @@ StateMachin2::AddStatus(StmStatu2 * let_dpStatus) } void -StateMachin2::AddToken( const char * in_sToken, - UINT16 in_nTokenId, - const INT16 * in_aBranches, - INT16 in_nBoundsStatus ) +StateMachin2::AddToken( const char * in_sToken, + UINT16 in_nTokenId, + const INT16 * in_aBranches, + INT16 in_nBoundsStatus ) { if (csv::no_str(in_sToken)) return; @@ -88,14 +88,14 @@ StateMachin2::AddToken( const char * in_sToken, CurrentStatus().SetBranch( *pChar, nPeekedStatus ); } nCurrentStatus = nPeekedStatus; - } // end for + } // end for StmArrayStatu2 & rLastStatus = CurrentStatus(); rLastStatus.SetTokenId(in_nTokenId); for (intt i = 0; i < nStatusSize; i++) { if (Status(rLastStatus.NextBy(i)).AsBounds() != 0) rLastStatus.SetBranch(i,in_nBoundsStatus); - } // end for + } // end for } StateMachin2::~StateMachin2() @@ -108,7 +108,7 @@ StateMachin2::~StateMachin2() } StmBoundsStatu2 & -StateMachin2::GetCharChain( UINT16 & o_nTokenId, +StateMachin2::GetCharChain( UINT16 & o_nTokenId, CharacterSource & io_rText ) { nCurrentStatus = C_nTopStatus; @@ -168,7 +168,7 @@ StateMachin2::BoundsStatus() const } void -StateMachin2::Peek(intt in_nBranch) +StateMachin2::Peek(intt in_nBranch) { StmArrayStatu2 & rSt = CurrentStatus(); nPeekedStatus = rSt.NextBy(in_nBranch); diff --git a/autodoc/source/parser_i/tokens/x_parse2.cxx b/autodoc/source/parser_i/tokens/x_parse2.cxx index 8194985388e0..8824d2ccc4db 100644 --- a/autodoc/source/parser_i/tokens/x_parse2.cxx +++ b/autodoc/source/parser_i/tokens/x_parse2.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 @@ -33,12 +33,12 @@ enum E_Type { - x_Any = 0, + x_Any = 0, x_InvalidChar, x_UnexpectedEOF }; void -X_AutodocParser::GetInfo( std::ostream & o_rOutputMedium ) const +X_AutodocParser::GetInfo( std::ostream & o_rOutputMedium ) const { switch (eType) { diff --git a/autodoc/source/tools/filecoll.cxx b/autodoc/source/tools/filecoll.cxx index 0e0a8ba5962b..30dccae039ad 100644 --- a/autodoc/source/tools/filecoll.cxx +++ b/autodoc/source/tools/filecoll.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 @@ -45,7 +45,7 @@ FileCollector::FileCollector( uintt i_nRoughNrOfFiles ) uintt FileCollector::AddFilesFrom( const char * i_sRootDir, - const char * i_sFilter, + const char * i_sFilter, E_SearchMode i_eSearchMode ) { uintt nSizeAtStart = aFoundFiles.size(); diff --git a/autodoc/source/tools/tkpchars.cxx b/autodoc/source/tools/tkpchars.cxx index 25210acfa6f7..c50c155df7a5 100644 --- a/autodoc/source/tools/tkpchars.cxx +++ b/autodoc/source/tools/tkpchars.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 @@ -36,7 +36,7 @@ CharacterSource::CharacterSource() - : dpSource(new char[2]), + : dpSource(new char[2]), nSourceSize(0), nCurPos(0), nLastCut(0), @@ -143,12 +143,12 @@ CharacterSource::MoveOn_OverStack() } CharacterSource:: -S_SourceState::S_SourceState( DYN char * dpSource_, - intt nSourceSize_, - intt nCurPos_, - intt nLastCut_, - intt nLastTokenStart_, - char cCharAtLastCut_ ) +S_SourceState::S_SourceState( DYN char * dpSource_, + intt nSourceSize_, + intt nCurPos_, + intt nLastCut_, + intt nLastTokenStart_, + char cCharAtLastCut_ ) : dpSource(dpSource_), nSourceSize(nSourceSize_), nCurPos(nCurPos_), |