office-gobmx/sw
Cédric Bosdonnat b399c1a38c n#592908: docx import, fixed handling of w10:wrap
commit f837c4288c moved the handling of
w10:wrap tag in oox, but thus no wrapping was imported any more.

The fix consists in letting the w10:wrap element be handled by writerfilter's
dmapper if the shape has already been retrieved from oox (which is the
case for textboxes). In other cases, make sure that we don't set the
Surround property once again in writerfilter as that would override what
has been done in oox.

(cherry picked from commit 51d5e90b7c)

Conflicts:
	oox/inc/oox/vml/vmlshape.hxx
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I8ab158641afcf6b9945c52238e7f5adb9e8b3adf
2013-04-30 09:34:28 +02:00
..
inc convert new user index dialog to .ui format 2013-04-29 11:40:57 +01:00
qa n#592908: docx import, fixed handling of w10:wrap 2013-04-30 09:34:28 +02:00
sdi
source fdo#62336 - fix horribly coupled table rendering code to not crash. 2013-04-29 18:04:10 +01:00
uiconfig convert new user index dialog to .ui format 2013-04-29 11:40:57 +01:00
util
AllLangResTarget_sw.mk convert drop down field dialog to .ui 2013-04-29 09:04:44 +01:00
CppunitTest_sw_filters_test.mk
CppunitTest_sw_layout_test.mk
CppunitTest_sw_macros_test.mk
CppunitTest_sw_odfexport.mk fdo#58949 testcase 2013-04-26 13:03:50 +02:00
CppunitTest_sw_odfimport.mk
CppunitTest_sw_ooxmlexport.mk
CppunitTest_sw_ooxmlimport.mk
CppunitTest_sw_rtfexport.mk
CppunitTest_sw_rtfimport.mk
CppunitTest_sw_uwriter.mk
CppunitTest_sw_ww8export.mk
CppunitTest_sw_ww8import.mk
JunitTest_sw_complex.mk
JunitTest_sw_unoapi.mk
Library_msword.mk
Library_sw.mk
Library_swd.mk
Library_swui.mk
Library_vbaswobj.mk
Makefile
Module_sw.mk
PythonTest_sw_python.mk fdo#55814 migrate java unit test to python 2013-04-27 11:56:30 +02:00
README
UIConfig_sglobal.mk
UIConfig_sweb.mk
UIConfig_swform.mk
UIConfig_swreport.mk
UIConfig_swriter.mk convert new user index dialog to .ui format 2013-04-29 11:40:57 +01:00
UIConfig_swxform.mk

Writer application code.

Exact history was lost before Sept. 18th, 2000, but old source code
comments show that Writer core dates back until at least November
1990.