diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-06-12 08:31:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-12 13:03:47 +0100 |
| commit | eeef836f689f6461f7e60bf1a151c6a362a01e59 (patch) | |
| tree | 62ebec755f05966622d782130512ca32d73b5325 /sw | |
| parent | bebf8ccfba37f77d6a43c7874249b31736467b17 (diff) | |
Related: #i119624# method <SwWW8ImplReader::IsObjectLayoutInTableCell(..)>
- correction of condition interpreting <LayoutInTableCell> attribute
- include support for Microsoft Office 2010 version
Found by: louqle <louqingle at gmail dot com>
Patch by: Oliver-Rainer Wittmann <orw at apache dot org>
Review by: zjchen <zjchencdl at gmail dot com>
(cherry picked from commit 3b8b3136a51af56321a1a35fcdd9ec1d7126daa3)
Conflicts:
sw/source/filter/ww8/ww8graf.cxx
Change-Id: I065ba88f0e08c5c5e892665933587fa2b796226e
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 11a2b3dd1df1..ac82b5a04c1a 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -2343,19 +2343,20 @@ bool SwWW8ImplReader::IsObjectLayoutInTableCell( const sal_uInt32 nLayoutInTable { bIsObjectLayoutInTableCell = false; OSL_ENSURE( nLayoutInTableCell == 0xFFFFFFFF, - "no explicit object attribute layout in table cell excepted." ); + "no explicit object attribute layout in table cell expected." ); } break; case 0x2000: // version 9 aka Microsoft Word 2000 case 0x4000: // version 10 aka Microsoft Word 2002 case 0x6000: // version 11 aka Microsoft Word 2003 case 0x8000: // version 12 aka Microsoft Word 2007 + case 0xC000: // version 14 aka Microsoft Word 2010 { // #i98037# // adjustment of conditions needed after deeper analysis of // certain test cases. if ( nLayoutInTableCell == 0xFFFFFFFF || // no explicit attribute value given - nLayoutInTableCell & 0x80008000 || + nLayoutInTableCell == 0x80008000 || ( nLayoutInTableCell & 0x02000000 && !(nLayoutInTableCell & 0x80000000 ) ) ) { |