diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-06 10:26:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-06 15:00:43 +0100 |
| commit | 9c015c0bd1df0ab4be999fe244ced998002cb0f6 (patch) | |
| tree | bd68ff99ba8ebc659b41ee9cf012fef192a5afeb /sal/textenc/textenc.cxx | |
| parent | 2e15fcf9240abd80be770e74634068fe12b79741 (diff) | |
Further clean up.
Diffstat (limited to 'sal/textenc/textenc.cxx')
| -rw-r--r-- | sal/textenc/textenc.cxx | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index cc226100e58e..164aab22f356 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -32,6 +32,7 @@ #include "sal/config.h" +#include <cstddef> #include <cstdlib> #include "boost/noncopyable.hpp" @@ -44,15 +45,10 @@ #include "sal/macros.h" #include "sal/types.h" -#include "context.hxx" #include "gettextencodingdata.hxx" +#include "tcvtutf8.hxx" #include "tenchelp.hxx" -#ifndef INCLUDED_STDDEF_H -#include <stddef.h> -#define INCLUDED_STDDEF_H -#endif - #define NOTABUNI_START 0xFF #define NOTABUNI_END 0x00 @@ -324,10 +320,10 @@ static ImplTextEncodingData const aImplUTF8TextEncodingData &ImplConvertUtf8ToUnicode, &ImplConvertUnicodeToUtf8, &ImplCreateUtf8ToUnicodeContext, - &ImplDestroyContext, + &ImplDestroyUtf8ToUnicodeContext, &ImplResetUtf8ToUnicodeContext, &ImplCreateUnicodeToUtf8Context, - &ImplDestroyContext, + &ImplDestroyUnicodeToUtf8Context, &ImplResetUnicodeToUtf8Context }, 1, 6, @@ -351,10 +347,10 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData &ImplConvertUtf8ToUnicode, &ImplConvertUnicodeToUtf8, &ImplCreateUtf8ToUnicodeContext, - &ImplDestroyContext, + &ImplDestroyUtf8ToUnicodeContext, &ImplResetUtf8ToUnicodeContext, &ImplCreateUnicodeToUtf8Context, - &ImplDestroyContext, + &ImplDestroyUnicodeToUtf8Context, &ImplResetUnicodeToUtf8Context }, 1, 3, |