diff options
-rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf127925.odt | bin | 0 -> 8677 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 8 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf127925.odt b/sw/qa/extras/ooxmlexport/data/tdf127925.odt Binary files differnew file mode 100644 index 000000000000..b91e48f055de --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf127925.odt diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index d9ee746f74b6..0d9cd773ef9a 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -881,6 +881,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf127579, "tdf127579.odt") assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:hyperlink/w:r/w:rPr/w:rStyle", "val", "InternetLink"); } +DECLARE_OOXMLEXPORT_TEST(testTdf127925, "tdf127925.odt") +{ + xmlDocPtr pXmlStyles = parseExport("word/styles.xml"); + if (!pXmlStyles) + return; + + assertXPath(pXmlStyles, "/w:styles/w:style[@w:styleId='VisitedInternetLink']/w:name", "val", "FollowedHyperlink"); +} CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index ca492efdd6b5..3c6813406420 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -633,6 +633,10 @@ void MSWordStyles::OutputStyle( SwFormat* pFormat, sal_uInt16 nPos ) { aName = "Hyperlink"; } + else if (aName.equalsIgnoreAsciiCase("Visited Internet Link")) + { + aName = "FollowedHyperlink"; + } m_rExport.AttrOutput().StartStyle( aName, (bFormatColl ? STYLE_TYPE_PARA : STYLE_TYPE_CHAR), nBase, nWwNext, GetWWId( *pFormat ), nPos, diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index aec6817c8fd3..08881a93a9fe 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -1408,7 +1408,7 @@ OUString StyleSheetTable::ConvertStyleName( const OUString& rWWName, bool bExten // { "Body Text Indent 3", "" }, // { "Block Text", "" }, { "Hyperlink", "Internet link" }, - { "Followed Hyperlink", "Visited Internet Link" }, + { "FollowedHyperlink", "Visited Internet Link" }, { "Emphasis", "Emphasis" }, // { "Document Map", "" }, // { "Plain Text", "" }, |