diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-02-07 18:18:26 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-07 19:06:16 +0000 |
| commit | bddc774795c139f84e0f76a83eb1b046b9f51a32 (patch) | |
| tree | 58f19132498c0a0366719b936f53a7e4dacfc747 | |
| parent | 58d4a3122ce59c68aa7a4b7e09f76bf15865be9b (diff) | |
remove CREATE_OSTRING macro
Change-Id: I7d5e1570918adc3b0cf2063d9735414233011a81
Reviewed-on: https://gerrit.libreoffice.org/34009
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/oox/helper/helper.hxx | 5 | ||||
| -rw-r--r-- | oox/source/vml/vmlinputstream.cxx | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx index 2dc924360227..1d9d1c480c9c 100644 --- a/include/oox/helper/helper.hxx +++ b/include/oox/helper/helper.hxx @@ -42,11 +42,6 @@ namespace oox { #define STATIC_ARRAY_SELECT( array, index, def ) \ ((static_cast<size_t>(index) < SAL_N_ELEMENTS(array)) ? ((array)[static_cast<size_t>(index)]) : (def)) -/** Expands to a temporary OString, created from a literal(!) character - array. */ -#define CREATE_OSTRING( ascii ) \ - OString( RTL_CONSTASCII_STRINGPARAM( ascii ) ) - /** Convert an OUString to an ASCII C string. Use for debug purposes only. */ #define OUSTRING_TO_CSTR( str ) \ OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr() diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index 0c413b15fc01..ee33bf606721 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -263,8 +263,8 @@ InputStream::InputStream( const Reference< XComponentContext >& rxContext, const mxTextStrm( TextInputStream::createXTextInputStream( rxContext, rxInStrm, RTL_TEXTENCODING_ISO_8859_1 ) ), maOpeningBracket( 1 ), maClosingBracket( 1 ), - maOpeningCData( CREATE_OSTRING( "<![CDATA[" ) ), - maClosingCData( CREATE_OSTRING( "]]>" ) ), + maOpeningCData( "<![CDATA[" ), + maClosingCData( "]]>" ), mnBufferPos( 0 ) { if (!mxTextStrm.is()) |