diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-03-29 11:03:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-29 11:12:22 +0200 |
| commit | 8aa60b51a9e48b33ba6f0cb27132c6a415de2358 (patch) | |
| tree | 2ad80da5172c7843c4a62f5cf6d1c737e98545c8 /sw | |
| parent | a159dfbea39dd3470837e73bf2df4cd2a0f3e806 (diff) | |
(const) char[] (i.e. size unknown) cannot be used with O(U)String
msvc can't handle the necessary template overload (and maybe it's
right, I'm not sure)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index dda8b81df9a4..00b8e18c9cf1 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -79,10 +79,10 @@ using rtl::OUStringBuffer; using sw::mark::IMark; -#if defined(UNX) +#if defined(UNX22) const sal_Char RtfExport::sNewLine = '\012'; #else -const sal_Char RtfExport::sNewLine[] = "\015\012"; +const sal_Char* const RtfExport::sNewLine = "\015\012"; #endif // the default text encoding for the export, if it doesn't fit unicode will diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 3759f318306d..9d395de0e209 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -155,10 +155,10 @@ public: /// Destructor. virtual ~RtfExport(); -#if defined(UNX) +#if defined(UNX22) static const sal_Char sNewLine; // \012 or \015 #else - static const sal_Char sNewLine[]; // \015\012 + static const sal_Char* const sNewLine; // \015\012 #endif rtl_TextEncoding eDefaultEncoding; |