diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 16:00:05 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 16:00:05 +0000 |
| commit | 1b4ee66ee8275d9e290c4fdd02530dd4df8d3980 (patch) | |
| tree | 643cad3b2a2eb634abbf4a0f9d53e06a866613f5 /autodoc | |
| parent | dca17d1f6c8f64a7dc0bfcb32f2aa5f49a418981 (diff) | |
INTEGRATION: CWS adc18 (1.7.2); FILE MERGED
2007/10/19 10:37:30 np 1.7.2.2: #i81775#
2007/10/18 15:23:18 np 1.7.2.1: #i81775#
Diffstat (limited to 'autodoc')
| -rw-r--r-- | autodoc/source/parser/cpp/preproc.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/autodoc/source/parser/cpp/preproc.cxx b/autodoc/source/parser/cpp/preproc.cxx index c81e109cf690..fe1145c9e9fd 100644 --- a/autodoc/source/parser/cpp/preproc.cxx +++ b/autodoc/source/parser/cpp/preproc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: preproc.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-09-18 14:15:10 $ + * last change: $Author: hr $ $Date: 2007-11-02 17:00:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,7 +38,7 @@ // NOT FULLY DEFINED SERVICES -#include <cosv/template/tpltools.hxx> +#include <cosv/tpl/tpltools.hxx> #include "all_toks.hxx" #include "defdescr.hxx" #include <tools/tkpchars.hxx> @@ -147,12 +147,12 @@ PreProcessor::On_expect_macro_param( cpp::Token & let_drToken ) } else if ( let_drToken.TypeId() == Tid_Comma AND nBracketInParameterCounter == 0 ) { - aCurMacroParams.push_back( udmstri(aCurParamText.c_str()) ); + aCurMacroParams.push_back( String (aCurParamText.c_str()) ); aCurParamText.seekp(0); return; } - // KORR FUTURE: + // KORR_FUTURE: // If in future whitespace is parsed also, that should match exactly and the // safety spaces, " ", here should be removed. aCurParamText << let_drToken.Text() << " "; @@ -161,7 +161,7 @@ PreProcessor::On_expect_macro_param( cpp::Token & let_drToken ) bool PreProcessor::CheckForDefine( cpp::Token & let_drToken ) { - udmstri sTokenText(let_drToken.Text()); + String sTokenText(let_drToken.Text()); pCurMacro = csv::value_from_map( *pCurValidDefines, sTokenText ); if (pCurMacro == 0 ) return false; @@ -222,7 +222,7 @@ PreProcessor::InterpretMacro() aCurParamText << " #unblock-" << dpCurMacroName->Text() << " "; pSourceText->InsertTextAtCurPos(aCurParamText.c_str()); - udmstri sCurMacroName(dpCurMacroName->Text()); + String sCurMacroName(dpCurMacroName->Text()); aBlockedMacroNames.insert( aBlockedMacroNames.begin(), sCurMacroName ); } |