writerfilter/source/rtftok/rtfcontrolwords.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit 9f5dfe07794130a96b7c2056f468354cb8d750ff Author: Miklos Vajna <vmik...@suse.cz> Date: Tue Mar 13 10:02:41 2012 +0100 Related: fdo#45563 RTF import of \r should be the same as \par diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx index f7036eb..cce0c2e 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", CONTROL_SYMBOL, RTF_PAR}, {"\r\n", CONTROL_SYMBOL, RTF_PAR}, {"_", CONTROL_SYMBOL, RTF_NOBRKHYPH}, {"{", CONTROL_SYMBOL, RTF_LBRACE}, commit f8c9ed1663ac675ed2151a584fcbf86b319cdaf1 Author: Christina Rossmanith <chrrossman...@web.de> Date: Sat Mar 10 15:21:49 2012 +0100 Bug 45563 - incorrect IMPORT of Zotero RTF, regression 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}, _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits