Skip to content

Commit

Permalink
Merge branch 't/13655'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Aug 31, 2015
2 parents e994879 + 6d27fa6 commit a0c9b89
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion tests/tickets/13590/1.js
@@ -1,5 +1,5 @@
/* bender-tags: clipboard,pastefromword,11215,8780,9685,12740,13616 */
/* bender-ckeditor-plugins: clipboard,pastefromword,format,ajax,basicstyles,font */
/* bender-ckeditor-plugins: clipboard,pastefromword,format,ajax,basicstyles,font,colorbutton */
/* bender-include: ../../plugins/clipboard/_helpers/pasting.js */
/* global assertPasteEvent */

Expand Down
2 changes: 1 addition & 1 deletion tests/tickets/13590/_assets/tc5_word_viewer_gecko.html
Expand Up @@ -71,4 +71,4 @@ <h1 style="page-break-before:always;mso-list:l0 level1 lfo2"><a name="_Toc405815

=>

<div style="border:none;border-bottom:solid #4f81bd 1.0pt;padding:0cm 0cm 4.0pt 0cm;"><p>regression test</p></div><p style="margin-left:0cm;">inhalt</p><p><a href="#_toc405815609">1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; general remarks<span style="text-decoration:none;text-underline:none;">. </span><span style="text-decoration:none;text-underline:none;">2</span></a></p><p>&nbsp;</p><h1><a name="_toc405815609">1general remarks</a><a name="_goback"></a></h1>
<div style="border:none;border-bottom:solid #4f81bd 1.0pt;padding:0cm 0cm 4.0pt 0cm;"><p>regression test</p></div><p style="margin-left:0cm;">inhalt</p><p><a href="#_toc405815609">1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; general remarks<span style="text-decoration:none;text-underline:none;"><span style="color:windowtext;">. </span></span><span style="text-decoration:none;text-underline:none;"><span style="color:windowtext;">2</span></span></a></p><p>&nbsp;</p><h1><a name="_toc405815609">1general remarks</a><a name="_goback"></a></h1>
2 changes: 1 addition & 1 deletion tests/tickets/13590/_assets/tc5_word_viewer_ie.html
Expand Up @@ -21,4 +21,4 @@

=>

<div style="border-width:medium medium 1pt;border-style:none none solid;padding:0cm 0cm 4pt;border-image:none;"><p style="margin:0cm 0cm 15pt;"><span style="font-size:large;"><span style="font-family:cambria;">regression test </span></span></p></div><p style="margin:24pt 0cm 0pt;"><strong><span style="font-size:large;"><span style="font-family:cambria;">inhalt</span></span></strong></p><p style="margin:0cm 0cm 5pt;"><a href="#_toc405815609"><span style="font-size:medium;"><span style="font-family:times new roman;">1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; general remarks<span style="text-decoration:none;text-underline:none;">. </span></span><span style="text-decoration:none;text-underline:none;">2</span></span></a></p><p style="margin:0cm 0cm 10pt;">&nbsp;</p><h1 style="margin:24pt 0cm 0pt 21.6pt;"><a name="_toc405815609">1<strong><span style="font-size:large;"><span style="font-family:cambria;">general remarks</span></span></strong></a><a name="_goback"></a></h1>
<div style="border-width:medium medium 1pt;border-style:none none solid;padding:0cm 0cm 4pt;border-image:none;"><p style="margin:0cm 0cm 15pt;"><span style="font-size:large;"><span style="font-family:cambria;"><span style="color:#17365d;">regression test </span></span></span></p></div><p style="margin:24pt 0cm 0pt;"><strong><span style="font-size:large;"><span style="font-family:cambria;"><span style="color:#365f91;">inhalt</span></span></span></strong></p><p style="margin:0cm 0cm 5pt;"><a href="#_toc405815609"><span style="font-size:medium;"><span style="font-family:times new roman;"><span style="color:#0000ff;">1</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span style="color:#0000ff;">general remarks</span><span style="text-decoration:none;text-underline:none;"><span style="color:windowtext;">. </span></span></span><span style="text-decoration:none;text-underline:none;"><span style="color:windowtext;">2</span></span></span></a></p><p style="margin:0cm 0cm 10pt;">&nbsp;</p><h1 style="margin:24pt 0cm 0pt 21.6pt;"><a name="_toc405815609"><span style="color:#365f91;">1</span><strong><span style="font-size:large;"><span style="font-family:cambria;">general remarks</span></span></strong></a><a name="_goback"></a></h1>
2 changes: 1 addition & 1 deletion tests/tickets/13590/_assets/tc5_word_viewer_webkit.html
Expand Up @@ -29,4 +29,4 @@ <h1 style="page-break-before:always;mso-list:l0 level1 lfo2"><a name="_Toc405815

=>

<div style="border:none;border-bottom:solid #4f81bd 1.0pt;padding:0cm 0cm 4.0pt 0cm;"><p>regression test</p></div><p style="margin-left:0cm;">inhalt</p><p><a href="#_toc405815609">1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; general remarks<span style="text-decoration-line:none;">. </span><span style="text-decoration-line:none;">2</span></a></p><p>&nbsp;</p><h1><a name="_toc405815609">1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; general remarks</a><a name="_goback"></a></h1>
<div style="border:none;border-bottom:solid #4f81bd 1.0pt;padding:0cm 0cm 4.0pt 0cm;"><p>regression test</p></div><p style="margin-left:0cm;">inhalt</p><p><a href="#_toc405815609">1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; general remarks<span style="text-decoration-line:none;"><span style="color:windowtext;">. </span></span><span style="text-decoration-line:none;"><span style="color:windowtext;">2</span></span></a></p><p>&nbsp;</p><h1><a name="_toc405815609">1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; general remarks</a><a name="_goback"></a></h1>
2 changes: 1 addition & 1 deletion tests/tickets/13590/_assets/tc6_word_viewer_gecko.html
Expand Up @@ -66,4 +66,4 @@

=>

<p>degree °</p><p>angle &nbsp;<span style="font-family:malgun gothic;"></span></p><p>pi π</p><ul><li>foo</li><li>bar</li><li>baz</li></ul><p><a name="_goback"></a>&nbsp;</p>
<p>degree °</p><p>angle &nbsp;<span style="font-family:malgun gothic;"></span></p><p>pi π</p><ul><li><span style="color:red;">foo</span></li><li><span style="color:red;">bar</span></li><li>baz</li></ul><p><a name="_goback"></a>&nbsp;</p>
2 changes: 1 addition & 1 deletion tests/tickets/13590/_assets/tc6_word_viewer_ie.html
Expand Up @@ -18,4 +18,4 @@

=>

<p style="margin:0cm 0cm 10pt;"><span style="font-size:medium;"><span style="font-family:calibri;">degree °</span></span></p><p style="margin:0cm 0cm 10pt;"><span style="font-size:medium;"><span style="font-family:calibri;">angle &nbsp;</span><span style="font-family:malgun gothic;"></span></span></p><p style="margin:0cm 0cm 10pt;"><span style="font-size:medium;"><span style="font-family:calibri;">pi π</span></span></p><ul><li style="font-weight:normal;margin-top:0cm;margin-bottom:0pt;">foo</li><li style="color:rgb(0, 0, 0);font-family:calibri;font-size:11pt;font-weight:normal;margin-top:0cm;margin-bottom:0pt;">bar</li><li style="color:rgb(0, 0, 0);font-family:calibri;font-size:11pt;font-weight:normal;margin-top:0cm;margin-bottom:10pt;">baz</li></ul><p style="margin:0cm 0cm 10pt;"><a name="_goback"></a>&nbsp;</p>
<p style="margin:0cm 0cm 10pt;"><span style="font-size:medium;"><span style="font-family:calibri;">degree °</span></span></p><p style="margin:0cm 0cm 10pt;"><span style="font-size:medium;"><span style="font-family:calibri;">angle &nbsp;</span><span style="font-family:malgun gothic;"></span></span></p><p style="margin:0cm 0cm 10pt;"><span style="font-size:medium;"><span style="font-family:calibri;">pi π</span></span></p><ul><li style="font-weight:normal;margin-top:0cm;margin-bottom:0pt;"><span style="color:red;">foo</span></li><li style="color:rgb(0, 0, 0);font-family:calibri;font-size:11pt;font-weight:normal;margin-top:0cm;margin-bottom:0pt;"><span style="color:red;">bar</span></li><li style="color:rgb(0, 0, 0);font-family:calibri;font-size:11pt;font-weight:normal;margin-top:0cm;margin-bottom:10pt;">baz</li></ul><p style="margin:0cm 0cm 10pt;"><a name="_goback"></a>&nbsp;</p>
2 changes: 1 addition & 1 deletion tests/tickets/13590/_assets/tc6_word_viewer_webkit.html
Expand Up @@ -21,4 +21,4 @@

=>

<p>degree °</p><p>angle &nbsp;<span style="font-family:malgun gothic;"></span></p><p>pi π</p><ul><li>foo</li><li>bar</li><li>baz</li></ul><p><a name="_goback"></a>&nbsp;</p>
<p>degree °</p><p>angle &nbsp;<span style="font-family:malgun gothic;"></span></p><p>pi π</p><ul><li><span style="color:red;">foo</span></li><li><span style="color:red;">bar</span></li><li>baz</li></ul><p><a name="_goback"></a>&nbsp;</p>

0 comments on commit a0c9b89

Please sign in to comment.