[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfcontrolwords.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1ce604a5f3366513bd86fe9feb938a53d996886e
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date:   Sat Mar 10 15:21:49 2012 +0100

    Bug 45563 - incorrect IMPORT of Zotero RTF, regression
    
    (cherry picked from commit f8c9ed1663ac675ed2151a584fcbf86b319cdaf1)
    
    Signed-off-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 3dd2672..f7036eb 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -39,6 +39,7 @@ RTFSymbol aRTFControlWords[] = {
     {":", CONTROL_SYMBOL, RTF_SUBENTRY},
     {"\\", CONTROL_SYMBOL, RTF_BACKSLASH},
     {"\n", CONTROL_SYMBOL, RTF_PAR},
+    {"\r\n", CONTROL_SYMBOL, RTF_PAR},
     {"_", CONTROL_SYMBOL, RTF_NOBRKHYPH},
     {"{", CONTROL_SYMBOL, RTF_LBRACE},
     {"|", CONTROL_SYMBOL, RTF_FORMULA},