include/oox/helper/helper.hxx | 5 -----
oox/source/vml/vmlinputstream.cxx | 4 ++--
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit bddc774795c139f84e0f76a83eb1b046b9f51a32
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Tue Feb 7 18:18:26 2017 +0100
remove CREATE_OSTRING macro
Change-Id: I7d5e1570918adc3b0cf2063d9735414233011a81
Reviewed-on: https://gerrit.libreoffice.org/34009
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
index 2dc9243..1d9d1c4 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 0c413b1..ee33bf6 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())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
