sw/source/filter/ww8/ww8atr.cxx | 7 +++++++
sw/source/filter/ww8/ww8graf2.cxx | 8 +++-----
2 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 9924d6d61af506a6d9cb1fdbe35af220ad2135fb
Author: Xisco Fauli <aniste...@gmail.com>
Date: Fri Apr 5 23:07:14 2013 +0200
Fix issue i120716: The graphic's border size and spacing is not correct
* source/filter/ww8/ww8graf2.cxx
MS Word Binary compatibility
Patch by: Fan Zheng,<zheng.easy...@gmail.com>
Found by: dongjun zong,<zongdj...@gmail.com>
Review by: Jian Hong Cheng,<chen...@apache.org>(cherry picked from commit
d91933a4fddd16e2997f7bc945424a97a540a8d3)
Change-Id: I63faa611317b554af3d34372ea0d4c8c2cbc4bfb
diff --git a/sw/source/filter/ww8/ww8graf2.cxx
b/sw/source/filter/ww8/ww8graf2.cxx
index b9f90a0..d98543b 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -599,11 +599,9 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
aAttrSet.Put(aFlySet);
}
-
- Rectangle aInnerDist( pRecord->nDxTextLeft,
- pRecord->nDyTextTop, pRecord->nDxTextRight,
- pRecord->nDyTextBottom );
-
+ //Modified for i120716,for graf importing from MS Word
2003 binary format,
+ //there is no border distance.
+ Rectangle aInnerDist(0,0,0,0);
MatchSdrItemsIntoFlySet( pObject, aAttrSet,
pRecord->eLineStyle, pRecord->eLineDashing,
pRecord->eShapeType, aInnerDist );
commit a2951d8cc1518638b357dfb09edafff7194b9eb3
Author: Jian Hong Cheng <chen...@apache.org>
Date: Wed Aug 22 04:17:49 2012 +0000
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,<chenpeng2...@gmail.com>
Found by: Yan Ji,<yanji...@gmail.com>
Review by: Jian Hong Cheng,<chen...@apache.org>
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 3210c5f..0b18e29 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 );
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
