strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS adc18 (1.5.2); FILE MERGED

Browse source 
2007/10/18 15:23:14 np 1.5.2.1: #i81775#
This commit is contained in:
Jens-Heiner Rechtien 2007-11-02 15:38:42 +00:00
parent ee1b9ca747
commit d993cc7e7d
2 changed files with 19 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
autodoc/source/display/idl/hfi_tag.hxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: hfi_tag.hxx,v $ * $RCSfile: hfi_tag.hxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: vg $ $Date: 2007-09-18 13:59:33 $ * last change: $Author: hr $ $Date: 2007-11-02 16:38:03 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -36,18 +36,14 @@
#ifndef ADC_DISPLAY_HFI_TAG_HXX #ifndef ADC_DISPLAY_HFI_TAG_HXX
#define ADC_DISPLAY_HFI_TAG_HXX #define ADC_DISPLAY_HFI_TAG_HXX
// BASE CLASSES
// USED SERVICES
// BASE CLASSES
#include "hi_factory.hxx" #include "hi_factory.hxx"
#include <ary_i/disdocum.hxx> #include <ary_i/disdocum.hxx>
// COMPONENTS // USED SERVICES
// PARAMETERS #include <ary/idl/i_types4idl.hxx>
#include <ary/idl/i_language.hxx>
#include <ary_i/ci_atag2.hxx> #include <ary_i/ci_atag2.hxx>
#include <ary_i/ci_text2.hxx> #include <ary_i/ci_text2.hxx>
#include <ary_i/codeinf2.hxx> #include <ary/doc/d_oldidldocu.hxx>
#include <toolkit/hf_docentry.hxx> #include <toolkit/hf_docentry.hxx>
@ -60,11 +56,13 @@ namespace idl
} }
/** This class is an implementation of ary::info::DocuText_Display
/** This class is an implementation of ary::inf::DocuText_Display
and will be used by that interface. and will be used by that interface.
*/ */
class HF_IdlDocuTextDisplay : public HtmlFactory_Idl, class HF_IdlDocuTextDisplay : public HtmlFactory_Idl,
public ary::info::DocuText_Display public ary::inf::DocuText_Display
{ {
public: public:
HF_IdlDocuTextDisplay( HF_IdlDocuTextDisplay(
@ -135,7 +133,7 @@ class HF_IdlShortDocu : public HtmlFactory_Idl
class HF_IdlTag : public HtmlFactory_Idl, class HF_IdlTag : public HtmlFactory_Idl,
public ary::info::DocuTag_Display public ary::inf::DocuTag_Display
{ {
public: public:
HF_IdlTag( HF_IdlTag(
@ -147,7 +145,7 @@ class HF_IdlTag : public HtmlFactory_Idl,
void Produce_byData( void Produce_byData(
Xml::Element & o_rTitle, Xml::Element & o_rTitle,
Xml::Element & o_rText, Xml::Element & o_rText,
const ary::info::AtTag2 & const ary::inf::AtTag2 &
i_rTag ) const; i_rTag ) const;
void Produce_byData( void Produce_byData(
Xml::Element & o_rTitle, Xml::Element & o_rTitle,
@ -172,7 +170,7 @@ class HF_IdlTag : public HtmlFactory_Idl,
Xml::Element & o_rText ) const; Xml::Element & o_rText ) const;
void Leave_TextOut() const; void Leave_TextOut() const;
void PutText_Out( void PutText_Out(
const ary::info::DocuTex2 & const ary::inf::DocuTex2 &
i_rText ) const; i_rText ) const;
// DATA // DATA
mutable Xml::Element * mutable Xml::Element *
@ -184,9 +182,4 @@ class HF_IdlTag : public HtmlFactory_Idl,
// IMPLEMENTATION
#endif #endif

18
autodoc/source/display/idl/hi_ary.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: hi_ary.cxx,v $ * $RCSfile: hi_ary.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: vg $ $Date: 2007-09-18 14:00:44 $ * last change: $Author: hr $ $Date: 2007-11-02 16:38:42 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -81,6 +81,7 @@ AryAccess::nextName( const char * & io_TextPtr,
: pEnd - io_TextPtr; : pEnd - io_TextPtr;
o_name.assign(io_TextPtr, nLen); o_name.assign(io_TextPtr, nLen);
io_TextPtr += nLen; io_TextPtr += nLen;
return nLen > 0; return nLen > 0;
} }
@ -170,7 +171,8 @@ AryAccess::Search_Ce( StringVector & o_module,
// Find main CodeEntity: // Find main CodeEntity:
if ( sNextName.length() == 0 ) if ( sNextName.length() == 0 )
return true; return true;
ary::idl::Ce_id nCe = pModule->Search_Name(sNextName); const ary::idl::Ce_id
nCe = pModule->Search_Name(sNextName);
if (NOT nCe.IsValid()) if (NOT nCe.IsValid())
return false; return false;
o_mainEntity = sNextName; o_mainEntity = sNextName;
@ -182,14 +184,6 @@ AryAccess::Search_Ce( StringVector & o_module,
if (strchr(o_memberEntity,':') != 0) if (strchr(o_memberEntity,':') != 0)
return false; // This must not happen in IDL return false; // This must not happen in IDL
int nMemberLen = o_memberEntity.length();
if ( nMemberLen > 2
? *(pNext + nMemberLen - 2) == '('
: false )
{
o_memberEntity.assign(o_memberEntity,nMemberLen-2);
}
#if 0 #if 0
// The following code avoids false links, but is rather expensive // The following code avoids false links, but is rather expensive
// in runtime time consumation. // in runtime time consumation.
@ -286,7 +280,7 @@ void
AryAccess::Get_IndexData( std::vector<ary::idl::Ce_id> & o_data, AryAccess::Get_IndexData( std::vector<ary::idl::Ce_id> & o_data,
ary::idl::alphabetical_index::E_Letter i_letter ) const ary::idl::alphabetical_index::E_Letter i_letter ) const
{ {
rGate.Secondaries().Get_AlphabeticalIndex(o_data, i_letter); rGate.Ces().Get_AlphabeticalIndex(o_data, i_letter);
} }