summaryrefslogtreecommitdiff
path: root/codemaker
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-07-11 12:28:01 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-07-11 12:28:01 +0000
commit2839c8a182a9fa1e32fec8a0b969b79c94121aa9 (patch)
tree5b6e9123668739ed51c30db084c4feb2c6214fc1 /codemaker
parent70b846b33c1b52fe9ed9ec83bf95e0e71c673476 (diff)
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
Diffstat (limited to 'codemaker')
-rw-r--r--codemaker/source/cppumaker/cpputype.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 7b877570d42f..e673c4c575fe 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -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());