summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJian Hong Cheng <chengjh@apache.org>2012-08-22 04:17:49 +0000
committerXisco Fauli <anistenis@gmail.com>2013-04-05 23:18:39 +0200
commita2951d8cc1518638b357dfb09edafff7194b9eb3 (patch)
tree2783d7b562563caf9bf96c68b50fa7d2186ac54f /sw
parent9c79ec29dba9dbdc6dc56f6e83b09f5176821768 (diff)
Fix issue #i119649: Hyperlink font size increased if saved to .doc file
* sw/source/filter/ww8/ww8atr.cxx MS Word Binary compatibility Patch by: Chen Peng,<chenpeng2006@gmail.com> Found by: Yan Ji,<yanji.yj@gmail.com> Review by: Jian Hong Cheng,<chengjh@apache.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 3210c5f1fc65..0b18e29c7884 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -229,6 +229,13 @@ void MSWordExportBase::ExportPoolItemsToCHP( sw::PoolItems &rItems, sal_uInt16 n
sal_uInt16 nWhich = pItem->Which();
if ( ( isCHRATR( nWhich ) || isTXTATR( nWhich ) ) && CollapseScriptsforWordOk( nScript, nWhich ) )
{
+ //In the id definition, RES_TXTATR_INETFMT must precede RES_TXTATR_CHARFMT, so that link style can overwrite char style.
+ //and in #i24291# it describes "All we want to do is ensure for now is that if a charfmt exist in the character
+ //properties that it rises to the top and is exported first."
+ //In bug 119649, it is in such situation, so we need to ignore the link style when doing ms word filter exports and
+ //add the second judgement for #i24291# definition.
+ if ( nWhich == RES_TXTATR_INETFMT && ( rItems.begin()->second->Which() == RES_TXTATR_CHARFMT ) )
+ continue;
AttrOutput().OutputItem( *pItem );
}
}