From 58f6be5c497e8c7654ae0ff9c5d409b2700e67ec Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 27 Jan 2005 10:19:39 +0000 Subject: INTEGRATION: CWS adc10 (1.3.8); FILE MERGED 2005/01/12 13:14:26 np 1.3.8.1: #i31025# Convenient error log file. --- autodoc/source/display/idl/hi_env.cxx | 13 +++++++++---- autodoc/source/display/idl/hi_env.hxx | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/autodoc/source/display/idl/hi_env.cxx b/autodoc/source/display/idl/hi_env.cxx index 9c19b9811ae5..9110597f870a 100644 --- a/autodoc/source/display/idl/hi_env.cxx +++ b/autodoc/source/display/idl/hi_env.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hi_env.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-07-12 15:30:45 $ + * last change: $Author: obo $ $Date: 2005-01-27 11:19:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -187,6 +187,12 @@ HtmlEnvironment_Idl::Link2Manual( const String & i_link ) const String HtmlEnvironment_Idl::CurPageCe_AsText() const +{ + return CurPageCe_AsFile(".html"); +} + +String +HtmlEnvironment_Idl::CurPageCe_AsFile(const char * i_sEnding) const { if (pCurPageCe == 0) return String::Null_(); @@ -199,7 +205,6 @@ HtmlEnvironment_Idl::CurPageCe_AsText() const if (aModule_.size() > 0) slCe().operator_join(aModule_.begin(), aModule_.end(), "/"); if (NOT sCe.empty()) - slCe() << "/" << sCe << ".html"; + slCe() << "/" << sCe << i_sEnding; return String(slCe().c_str()); } - diff --git a/autodoc/source/display/idl/hi_env.hxx b/autodoc/source/display/idl/hi_env.hxx index 249564746fa7..45ef90de8289 100644 --- a/autodoc/source/display/idl/hi_env.hxx +++ b/autodoc/source/display/idl/hi_env.hxx @@ -2,9 +2,9 @@ * * $RCSfile: hi_env.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-07-12 15:31:03 $ + * last change: $Author: obo $ $Date: 2005-01-27 11:19:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,6 +155,8 @@ class HtmlEnvironment_Idl output::Position i_destination ) { CurPosition().Get_LinkTo(o_result, i_destination); } String CurPageCe_AsText() const; + String CurPageCe_AsFile( + const char * i_sEnding) const; const ary::idl::CodeEntity * CurPageCe() const { return pCurPageCe; } -- cgit