summaryrefslogtreecommitdiff
path: root/autodoc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-11-02 16:03:57 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-11-02 16:03:57 +0000
commit5efa233c51951138eea81ee6de64013b72aea535 (patch)
tree50905f28a58e7a6abcd92db00cbf3116870a0fdb /autodoc
parent45ee788a4d22db0448d3986e2228a0662f3fef95 (diff)
INTEGRATION: CWS adc18 (1.5.2); FILE MERGED
2007/10/18 15:23:19 np 1.5.2.1: #i81775#
Diffstat (limited to 'autodoc')
-rw-r--r--autodoc/source/parser/kernel/x_parse.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/autodoc/source/parser/kernel/x_parse.cxx b/autodoc/source/parser/kernel/x_parse.cxx
index e66c2b8221c4..e7f2595c454d 100644
--- a/autodoc/source/parser/kernel/x_parse.cxx
+++ b/autodoc/source/parser/kernel/x_parse.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: x_parse.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: vg $ $Date: 2007-09-18 14:16:23 $
+ * last change: $Author: hr $ $Date: 2007-11-02 17:03:57 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -42,7 +42,7 @@
X_Parser::X_Parser( E_Event i_eEvent,
const char * i_sObject,
- const udmstri & i_sCausingFile_FullPath,
+ const String & i_sCausingFile_FullPath,
uintt i_nCausingLineNr )
: eEvent(i_eEvent),
sObject(i_sObject),
@@ -62,7 +62,7 @@ X_Parser::GetEvent() const
}
void
-X_Parser::GetInfo( ostream & o_rOutputMedium ) const
+X_Parser::GetInfo( std::ostream & o_rOutputMedium ) const
{
o_rOutputMedium << "Error in file "
<< sCausingFile_FullPath
@@ -97,11 +97,10 @@ X_Parser::GetInfo( ostream & o_rOutputMedium ) const
}
-ostream &
-operator<<( ostream & o_rOut,
+std::ostream &
+operator<<( std::ostream & o_rOut,
const autodoc::X_Parser_Ifc & i_rException )
{
i_rException.GetInfo(o_rOut);
return o_rOut;
}
-