diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2014-06-26 09:24:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-26 16:29:17 +0100 |
| commit | e28797356f34253bcbe7237d7bfdbcda2a3f5b3c (patch) | |
| tree | 0171743138c2b9febf62dbc6e5a38abbc9f2117f /sal/CppunitTest_sal_osl_mutex.mk | |
| parent | 749bd87e90ed80c26d93748f2fbe682d533c53f1 (diff) | |
Resolves: #i125122# WW8 import: Handle nested TOX fields
- only the content of nested TOX fields is imported, no TOX field itself
(cherry picked from commit 1df1e98e7b6556892f546cc559e31f9fd9e00a78)
(cherry picked from commit b2d0492ea85a2f96378326361421749619269b15)
Conflicts:
sw/source/filter/ww8/ww8par.hxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
Change-Id: I29cf81df72bf548414bef06b54a691eae6a5edcd
Diffstat (limited to 'sal/CppunitTest_sal_osl_mutex.mk')
0 files changed, 0 insertions, 0 deletions