summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-04-02 15:57:33 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-04-02 16:47:34 +0200
commite68bfafdcbafc38abe281a2242cfba21354c1bd6 (patch)
tree75f84000636ead62c1701fae79357ce19c78475f /sw
parentd0fead61293fdcee8ce3f7ed620784cc093a21ea (diff)
implement import/export of RTF_MNOR
Change-Id: I9caea7fbea4643e57d81ad3b7812d0cc10f54c11
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/rtfexport/data/mnor.rtf86
-rw-r--r--sw/qa/extras/rtfexport/rtfexport.cxx10
2 files changed, 96 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/data/mnor.rtf b/sw/qa/extras/rtfexport/data/mnor.rtf
new file mode 100644
index 000000000000..c29f1b4ab4bd
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/mnor.rtf
@@ -0,0 +1,86 @@
+{\rtf1\ansi\deff4\adeflang1025
+{\fonttbl
+{\f0\froman\fprq2\fcharset0 Times New Roman;}
+{\f1\froman\fprq2\fcharset2 Symbol;}
+{\f2\fswiss\fprq2\fcharset0 Arial;}
+{\f3\froman\fprq2\fcharset0 Times New Roman;}
+{\f4\fswiss\fprq0\fcharset1 Calibri;}
+{\f5\fswiss\fprq2\fcharset0 Arial;}
+{\f6\fswiss\fprq0\fcharset1 Times New Roman;}
+{\f7\fswiss\fprq0\fcharset1 Tahoma;}
+{\f8\fnil\fprq2\fcharset0 Droid Sans Fallback;}
+{\f9\fnil\fprq2\fcharset0 Arial;}
+{\f10\fswiss\fprq0\fcharset1 Arial;}
+}
+{\colortbl;\red0\green0\blue0;\red128\green128\blue128;}
+{\stylesheet
+{\s0\snext0\ql\nowidctlpar
+\ltrpar\sl276\slmult1\sb0\sa200\cf0\dbch\af8\langfe2052\dbch\af9\afs24\alang1081\kerning1\loch\f6\fs24\lang1029 Default Style;}
+{\*\cs15\snext15 Default Paragraph Font;}
+{\*\cs16\sbasedon15\snext16\afs16\loch\f7\fs16 Balloon Text Char;}
+{\s17\sbasedon0\snext18\ql\nowidctlpar
+\sb240\sa120\keepn\ltrpar\cf0\dbch\af8\langfe2052\dbch\af9\afs28\alang1081\loch\f5\fs28\lang1029 Heading;}
+{\s18\sbasedon0\snext18\ql\nowidctlpar
+\sb0\sa120\ltrpar\cf0\dbch\af8\langfe2052\dbch\af9\afs24\alang1081\loch\f6\fs24\lang1029 Text Body;}
+{\s19\sbasedon18\snext19\ql\nowidctlpar
+\sb0\sa120\ltrpar\cf0\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f4\fs24\lang1029 List;}
+{\s20\sbasedon0\snext20\ql\nowidctlpar
+\sb120\sa120\noline\ltrpar\cf0\i\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\ai\loch\f4\fs24\lang1029 Caption;}
+{\s21\sbasedon0\snext21\ql\nowidctlpar
+\noline\ltrpar\cf0\dbch\af8\langfe2052\dbch\af10\afs24\alang1081\loch\f4\fs24\lang1029 Index;}
+{\s22\sbasedon0\snext22\ql\nowidctlpar
+\sb120\sa120\noline\ltrpar\cf0\i\dbch\af8\langfe2052\dbch\af9\afs24\alang1081\ai\loch\f6\fs24\lang1029 caption;}
+{\s23\sbasedon0\snext23\ql\sl100\slmult0\nowidctlpar
+\sb0\sa0\ltrpar\cf0\dbch\af8\langfe2052\dbch\af9\afs16\alang1081\loch\f7\fs16\lang1029 Balloon Text;}
+}
+{\info
+{\creatim\yr2013\mo4\dy2\hr13\min40}
+{\author vmiklos}
+{\revtim\yr2013\mo4\dy2\hr13\min40}
+{\printim\yr0\mo0\dy0\hr0\min0}
+{\comment LibreOffice}
+{\vern67174400}
+}
+\deftab709
+\viewscale147
+\formshade
+\paperh16838\paperw11906\margl1134\margr1134\margt1134\margb1134\sectd\sbknone\sectunlocked1\pgndec\pgwsxn11906\pghsxn16838\marglsxn1134\margrsxn1134\margtsxn1134\margbsxn1134\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc
+\pgndec\pard\plain \s0\ql\nowidctlpar
+\ltrpar\sl276\slmult1\sb0\sa200\cf0\dbch\af8\langfe2052\dbch\af9\afs24\alang1081\kerning1\loch\f6\fs24\lang1029
+{
+\rtlch \ltrch
+{\mmath
+{\*\moMath
+{\mnary
+{\mnaryPr
+{\mchr \u8749\'2d}
+}
+{\msub
+{\mr V}
+}
+{\msup }
+{\me
+{\mr \mnor divF}
+}
+}
+{\mr dV}
+{\mr =}
+{\mnary
+{\mnaryPr
+{\mchr \u8751\'2f}
+}
+{\msub
+{\mr S}
+}
+{\msup }
+{\me
+{\mr \mnor F}
+{\mr \u8729\'19}
+{\mr \mnor n }
+{\mr dS}
+}
+}
+}
+}
+}
+\par }
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index ec0ff695d526..cd153fc77c9a 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -73,6 +73,7 @@ public:
void testFdo61507();
void testFdo30983();
void testPlaceholder();
+ void testMnor();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -120,6 +121,7 @@ void Test::run()
{"fdo61507.rtf", &Test::testFdo61507},
{"fdo30983.rtf", &Test::testFdo30983},
{"placeholder.odt", &Test::testPlaceholder},
+ {"mnor.rtf", &Test::testMnor},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -506,6 +508,14 @@ void Test::testPlaceholder()
CPPUNIT_ASSERT_EQUAL(OUString("place holder"), getProperty<OUString>(xField, "Hint"));
}
+void Test::testMnor()
+{
+ // \mnor wasn't handled, leading to missing quotes around "divF" and so on.
+ OUString aActual = getFormula(getRun(getParagraph(1), 1));
+ OUString aExpected("iiint from {V} to <?> {\"divF\"} dV = llint from {S} to <?> {\"F\" ∙ \"n\" dS}", 74, RTL_TEXTENCODING_UTF8);
+ CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();