diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-22 14:49:41 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-22 15:08:48 +0200 |
| commit | 55c832d86e6cb06e9d6423ce5e6245189bc80da1 (patch) | |
| tree | e9ab7eb07320462856c2c8167e03fb4c04a0e58a /sw/qa | |
| parent | 5c6b74f24494a0426067dfcb54b7b8fb0e01c821 (diff) | |
fdo#77600 RTF export: always close URL's before the end of run
In case the URL text has multiple portions, then MSWordExportBase
generates multiple URL's anyway, and this helps to avoid loosing some
direct formatting of the remaining portions of the paragraph.
Change-Id: Ifd72741de610ce69b9ae0978aa8f9a532a3aeed2
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/rtfexport/data/fdo77600.rtf | 25 | ||||
| -rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 6 |
2 files changed, 31 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/data/fdo77600.rtf b/sw/qa/extras/rtfexport/data/fdo77600.rtf new file mode 100644 index 000000000000..5c6a488eb92f --- /dev/null +++ b/sw/qa/extras/rtfexport/data/fdo77600.rtf @@ -0,0 +1,25 @@ +{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0 +{\fonttbl +{\f0\fbidi \froman\fcharset238\fprq2 +Times New Roman;} +{\f1\fbidi \fswiss\fcharset238\fprq2 +Arial;} +} +\pard\plain \ltrpar +\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid6446855 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 +{\rtlch\fcs1 \af1 \ltrch\fcs0 +\f1\fs20\insrsid6446855 Before } +{\field\fldedit +{\*\fldinst +{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1260577 HYPERLINK "http://www.microsoft.com/en-us/news/press/2013/jul13/07-11onemicrosoft.aspx" } +} +{\fldrslt +{\rtlch\fcs1 \af1 \ltrch\fcs0 +\cs61\f1\fs20\ul\cf17\insrsid6446855\charrsid4592903 href} +} +} +\sectd \ltrsect\psz1\linex0\endnhere\sectdefaultcl\sectrsid6897289\sftnbj +{\rtlch\fcs1 \af1 \ltrch\fcs0 \f1\fs20\insrsid6446855 after.} +{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid6446855 +\par } +} diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index a0ffe5d164cf..c395ec9e64c5 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -619,6 +619,12 @@ DECLARE_RTFEXPORT_TEST(testLineNumbering, "linenumbering.rtf") CPPUNIT_ASSERT_EQUAL(sal_Int32(5), getProperty<sal_Int32>(xPropertySet, "Interval")); } +DECLARE_RTFEXPORT_TEST(testFdo77600, "fdo77600.rtf") +{ + // This was 'Liberation Serif'. + CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(getRun(getParagraph(1), 3), "CharFontName")); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); |