diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-05-02 08:22:00 -0300 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-05-09 09:49:15 +0000 |
| commit | 86b73eeef4350f0bf29c8ff3c71abb86fc1f6572 (patch) | |
| tree | 12d4f449ef82eaa27cef064a7d2aee95d5588bb0 /sw/source | |
| parent | 596c3b459d2e1976ac4ac4e10f152c6353e79e36 (diff) | |
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>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/html/htmlform.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/misc/redlndlg.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 093d58b34dc8..ec85cccaf179 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -1680,8 +1680,8 @@ void SwHTMLParser::InsertInput() // geloescht werden. if( !bKeepCRLFInValue ) { - sText = comphelper::string::remove(sText, _CR); - sText = comphelper::string::remove(sText, _LF); + sText = comphelper::string::remove(sText, '\r'); + sText = comphelper::string::remove(sText, '\n'); } const uno::Reference< XMultiServiceFactory > & rServiceFactory = diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index dc08ad5eb424..3f0f679aa3ee 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -5422,8 +5422,8 @@ void SwHTMLParser::ParseMoreMetaOptions() aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_script_type ) ) return; - aContent = comphelper::string::remove(aContent, _CR); - aContent = comphelper::string::remove(aContent, _LF); + aContent = comphelper::string::remove(aContent, '\r'); + aContent = comphelper::string::remove(aContent, '\n'); if( aName.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_sdendnote ) ) { diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index cf9ff24bb953..7885bb402ec2 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -434,7 +434,7 @@ void SwRedlineAcceptDlg::Activate() { // update only comment String sComment(rRedln.GetComment()); - sComment.SearchAndReplaceAll((sal_Unicode)_LF,(sal_Unicode)' '); + sComment.SearchAndReplaceAll((sal_Unicode)'\n',(sal_Unicode)' '); pTable->SetEntryText(sComment, pParent->pTLBParent, 3); } pParent->sComment = rRedln.GetComment(); @@ -721,7 +721,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd) pRedlineParent->pData = pRedlineData; pRedlineParent->pNext = 0; String sComment(rRedln.GetComment()); - sComment.SearchAndReplaceAll((sal_Unicode)_LF,(sal_Unicode)' '); + sComment.SearchAndReplaceAll((sal_Unicode)'\n',(sal_Unicode)' '); pRedlineParent->sComment = sComment; aRedlineParents.insert(aRedlineParents.begin() + i, pRedlineParent); @@ -1108,7 +1108,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) // insert / change comment pSh->SetRedlineComment(sMsg); - sMsg.SearchAndReplaceAll((sal_Unicode)_LF,(sal_Unicode)' '); + sMsg.SearchAndReplaceAll((sal_Unicode)'\n',(sal_Unicode)' '); pTable->SetEntryText(sMsg, pEntry, 3); } |