INTEGRATION: CWS jsc21 (1.44.16); FILE MERGED

2008/04/23 09:48:35 jsc 1.44.16.2: RESYNC: (1.44-1.45); FILE MERGED
2008/02/13 08:54:57 jsc 1.44.16.1: #i72964# remove external header guards
This commit is contained in:
Rüdiger Timm 2008-07-11 12:28:01 +00:00
parent 70b846b33c
commit 2839c8a182

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: cpputype.cxx,v $
* $Revision: 1.45 $
* $Revision: 1.46 $
*
* This file is part of OpenOffice.org.
*
@ -331,7 +331,7 @@ OString CppuType::dumpHeaderDefine(
OStringBuffer tmpBuf(length);
tmpBuf.append('_');
tmpBuf.append("INCLUDED_");
tmpBuf.append(m_typeName);
tmpBuf.append('_');
if (bExtended)
@ -340,7 +340,6 @@ OString CppuType::dumpHeaderDefine(
tmpBuf.append('_');
}
tmpBuf.append(prefix);
tmpBuf.append('_');
OString tmp(tmpBuf.makeStringAndClear().replace('/', '_').toAsciiUpperCase());