From 86b73eeef4350f0bf29c8ff3c71abb86fc1f6572 Mon Sep 17 00:00:00 2001
From: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Date: Thu, 2 May 2013 08:22:00 -0300
Subject: fdo#63154: Remove _CL and _LF from solar.h
And use RTL_CHAR_{CR,LF} from rtl/string.h
Conflicts:
vcl/source/app/dbggui.cxx
Change-Id: I05b0325006845e48eb5483485a9042aa7b0cd22a
Reviewed-on: https://gerrit.libreoffice.org/3740
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
---
svtools/source/svhtml/parhtml.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'svtools')
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index d8d5080fcf92..6e2fce3cb15a 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -2107,8 +2107,8 @@ bool HTMLParser::ParseMetaOptionsImpl(
if ( bHTTPEquiv || HTML_META_DESCRIPTION != nAction )
{
// if it is not a Description, remove CRs and LFs from CONTENT
- aContent = comphelper::string::remove(aContent, _CR);
- aContent = comphelper::string::remove(aContent, _LF);
+ aContent = comphelper::string::remove(aContent, '\r');
+ aContent = comphelper::string::remove(aContent, '\n');
}
else
{
--
cgit