summaryrefslogtreecommitdiffstats
path: root/sal/textenc
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-06-27 12:25:55 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-06-27 12:25:55 +0000
commit9586e8db41db3450deb8f9b88a81a0fe44e54338 (patch)
treeab960709ca40d282393710a8d30b5e1b2bb5eccb /sal/textenc
parentINTEGRATION: CWS sb70 (1.26.4); FILE MERGED (diff)
downloadcore-9586e8db41db3450deb8f9b88a81a0fe44e54338.tar.gz
core-9586e8db41db3450deb8f9b88a81a0fe44e54338.zip
INTEGRATION: CWS sb70 (1.5.86); FILE MERGED
2007/06/08 12:04:06 sb 1.5.86.2: #i78213# After some thought, removed the redundant extern C around function definition again. 2007/06/08 11:53:35 sb 1.5.86.1: #i78213# Missing extern C stuff.
Diffstat (limited to 'sal/textenc')
-rw-r--r--sal/textenc/textenc.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 619b02715760..7aea0828e64f 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: textenc.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 09:08:36 $
+ * last change: $Author: hr $ $Date: 2007-06-27 13:25:55 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -140,7 +140,7 @@ static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 };
#include "convertadobe.tab"
ImplTextEncodingData const *
-Impl_getTextEncodingData(rtl_TextEncoding nEncoding)
+Impl_getTextEncodingData(rtl_TextEncoding nEncoding) SAL_THROW_EXTERN_C()
{
static ImplTextEncodingData const * const aData[]
= { NULL, /* DONTKNOW */