Also, adapt anchoring to what we have in VML import as well: when the
paragraph moves, the shape should stay at the same place. (This is a bit
odd, as ideally Word does not support at-paragraph anchoring, but this
change results in the behavior what Word does at the end.)

Change-Id: I3b849b2898d303e48920e6056c472f08fbb43af1

Change-Id: I52b53da16784cc5650d362c3884d93ed16979ca2

(cherry picked from commit c2afeb1c)

Conflicts:
	sw/inc/IDocumentContentOperations.hxx
	sw/inc/crsrsh.hxx
	sw/inc/doc.hxx
	sw/inc/editsh.hxx
	sw/inc/expfld.hxx
	sw/inc/fldbas.hxx
	sw/inc/fmtfld.hxx
	sw/inc/hintids.hxx
	sw/inc/ndtxt.hxx
	sw/inc/txatbase.hxx
	sw/inc/txtfld.hxx
	sw/inc/txtrfmrk.hxx
	sw/inc/txttxmrk.hxx
	sw/inc/viscrs.hxx
	sw/source/core/bastyp/init.cxx
	sw/source/core/crsr/crsrsh.cxx
	sw/source/core/crsr/crstrvl.cxx
	sw/source/core/crsr/findattr.cxx
	sw/source/core/crsr/findtxt.cxx
	sw/source/core/crsr/swcrsr.cxx
	sw/source/core/crsr/viscrs.cxx
	sw/source/core/doc/dbgoutsw.cxx
	sw/source/core/doc/doc.cxx
	sw/source/core/doc/docfld.cxx
	sw/source/core/doc/docfmt.cxx
	sw/source/core/doc/docnum.cxx
	sw/source/core/doc/docredln.cxx
	sw/source/core/doc/docruby.cxx
	sw/source/core/doc/doctxm.cxx
	sw/source/core/doc/visiturl.cxx
	sw/source/core/docnode/nodes.cxx
	sw/source/core/edit/edatmisc.cxx
	sw/source/core/edit/edattr.cxx
	sw/source/core/edit/edfld.cxx
	sw/source/core/edit/edfldexp.cxx
	sw/source/core/edit/editsh.cxx
	sw/source/core/edit/edlingu.cxx
	sw/source/core/edit/ednumber.cxx
	sw/source/core/fields/expfld.cxx
	sw/source/core/fields/fldbas.cxx
	sw/source/core/fields/reffld.cxx
	sw/source/core/frmedt/fefly1.cxx
	sw/source/core/inc/docfld.hxx
	sw/source/core/inc/rolbck.hxx
	sw/source/core/inc/swfont.hxx
	sw/source/core/layout/flycnt.cxx
	sw/source/core/layout/laycache.cxx
	sw/source/core/layout/trvlfrm.cxx
	sw/source/core/text/atrhndl.hxx
	sw/source/core/text/atrstck.cxx
	sw/source/core/text/inftxt.cxx
	sw/source/core/text/porfld.cxx
	sw/source/core/text/porfld.hxx
	sw/source/core/text/txtfld.cxx
	sw/source/core/tox/tox.cxx
	sw/source/core/tox/txmsrt.cxx
	sw/source/core/txtnode/atrfld.cxx
	sw/source/core/txtnode/ndhints.cxx
	sw/source/core/txtnode/ndtxt.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/txtnode/txatbase.cxx
	sw/source/core/txtnode/txatritr.cxx
	sw/source/core/txtnode/txtedt.cxx
	sw/source/core/undo/SwUndoField.cxx
	sw/source/core/undo/rolbck.cxx
	sw/source/core/undo/unsect.cxx
	sw/source/core/undo/untbl.cxx
	sw/source/core/unocore/unocrsrhelper.cxx
	sw/source/core/unocore/unofield.cxx
	sw/source/core/unocore/unoframe.cxx
	sw/source/core/unocore/unorefmk.cxx
	sw/source/core/view/vprint.cxx
	sw/source/filter/ascii/ascatr.cxx
	sw/source/filter/html/htmlatr.cxx
	sw/source/filter/rtf/rtffly.cxx
	sw/source/filter/ww1/fltshell.cxx
	sw/source/filter/ww1/w1filter.cxx
	sw/source/filter/ww8/wrtw8esh.cxx
	sw/source/filter/ww8/wrtw8nds.cxx
	sw/source/filter/ww8/ww8atr.cxx
	sw/source/filter/ww8/ww8par.cxx
	sw/source/filter/ww8/ww8par3.cxx
	sw/source/filter/ww8/ww8par5.cxx
	sw/source/ui/app/applab.cxx
	sw/source/ui/docvw/edtwin.cxx
	sw/source/ui/docvw/edtwin2.cxx
	sw/source/ui/envelp/envfmt.cxx
	sw/source/ui/fldui/fldedt.cxx
	sw/source/ui/fldui/fldmgr.cxx
	sw/source/ui/inc/wrtsh.hxx
	sw/source/ui/lingu/hhcwrp.cxx
	sw/source/ui/shells/basesh.cxx
	sw/source/ui/shells/drwtxtex.cxx
	sw/source/ui/shells/grfsh.cxx
	sw/source/ui/shells/tabsh.cxx
	sw/source/ui/shells/textfld.cxx
	sw/source/ui/shells/textidx.cxx
	sw/source/ui/shells/textsh.cxx
	sw/source/ui/shells/textsh1.cxx
	sw/source/ui/shells/txtattr.cxx
	sw/source/ui/uiview/formatclipboard.cxx
	sw/source/ui/uiview/view.cxx
	sw/source/ui/uiview/view2.cxx
	sw/source/ui/uiview/viewsrch.cxx
	sw/source/ui/uiview/viewstat.cxx
	sw/source/ui/uiview/viewtab.cxx
	sw/source/ui/wrtsh/wrtsh1.cxx
	sw/source/ui/wrtsh/wrtsh2.cxx

Change-Id: I6758d6719e1fd523797cc6ee2648ffcb47d52595

Change-Id: I189c08a4100b32b16527ae40df3a9125bf78be88

Change-Id: Ideb0742c2c6f3f7ba45af23359d5a653f58b120c

Change-Id: I337691b4a7548c5c92bc0484c2ef9224ce461ba5

Change-Id: I4ae45a0809cc57fad3d8e872952aedfead27a518

This commit enables CURLINFO_CERTINFO when curl is built with NSS
support but not openssl.

Change-Id: I1482b34d83a0ae0f47d524a940bb90ed072363a6

Change-Id: Ie5374f2e81e1429294805f05ae432fba86cc50df

Change-Id: I4a18f32f56a7489b2087629e1de05ce7cc5bdb17

Change-Id: I6e2be7da65221aa090d7ee2a0f8a6c7698ec2f89

Change-Id: I635533033f9a063ac1e6c5c18bf93803144a12c8

Change-Id: I6377c9228589d324d51d0c3cc12f04b7854db5ac

Change-Id: I3593b3fc7e0ad405612216fb07e8632050b75cee

Change-Id: Ib090d9a6a007a738a0603d1d0a38d5b274feadcc

Change-Id: Ie3625211a32c41dd0fadf94294bc689aef7b1c24

Change-Id: I79b75bbb193851855328a7dbbd8ab547afe29aec

Change-Id: I51942eb3719459abc0353a7fd024784f2c4abdb3

Change-Id: I0144586864045b5f6091dc49ed7e1e1a73705ce1

Change-Id: I74af65aba6d19e39f889a28b15d04f7e293168c5

Change-Id: I1257f4568e55ca545e96bda8a53f272ba8e1f0b0

Change-Id: I54abcc2a9fbe7d30bdf64d194df1a435d21f24ac

Change-Id: I1374814e549dcbb33de75ffa118d1eccfd168893

Change-Id: I99b24b026c50a05f8f3803348c76277e29a45ec7

Change-Id: I969ff5ed6fd979e9fd126e8d0b79a518697e7915

Change-Id: I1bc87e1c84926699a80a2bb0a9ee789e92663dfc

Change-Id: Idd77baf2f84550f1a29e5eaf9afb4aa454e79154

resolves the linker errors

Change-Id: I24d18a4491c8bc4f5839f9245386d0cd2b612cf0

Change-Id: Idf92176c66cefde3022cec2990c9711a1b49a111

Change-Id: I6251042266f531a28944197bda8d2fab39fce495

Change-Id: I9aa4b71d12bb6720e2197dc1de6f06c61f27d6ee

Change-Id: I91878c0883f0de03341eee65f2925ec3beb71889

This class contains the glcontext

Change-Id: If0418cfbfb0486396a75ab274e7b480607f8de6d

Change-Id: I776455675a066dad790bc6beac4aa545186d5192

Change-Id: I02435256f747bb2bff63414735fa5af3b3413e82

Change-Id: I2bc8c39f91faf6915c4970a002e4030f81c95bc5