Change-Id: Iea687761a137650965ed48340063d20b6489b531

Change-Id: I46c5290ab411ac133ef8ea1e461197b00d837068

formula wrapped by inserted frame when caption is added

(cherry picked from commit 0681d4e0)

Change-Id: Ie526391b8676c259a77060dbe04c3e7c8ad499c0

This update will obsolete two patches that were previously applied.

Change-Id: I521e939905e473ca5d440dea3b03faeb9af4c0fb

Change-Id: Ifc5454bbcd29730002b0a3261d2c34dee8ffb843

Change-Id: I36dd015635c30f63e2085c250e159fbd536da611

- rely annotations on text ranges on new annotation marks
- support arbitrary text ranges for annotations
- fix undo/redo regarding annotations an text ranges
- support annotations on overlapping text ranges
- fix *.docx import for annotations on overlapping text ranges
- fix ODF import of annotations on text ranges

cherry-picked from branch ooxml-osba

(cherry picked from commit ebd2922e)

Conflicts:
	sw/Library_sw.mk
	sw/inc/IDocumentMarkAccess.hxx
	sw/inc/SidebarWin.hxx
	sw/inc/doc.hxx
	sw/inc/docufld.hxx
	sw/inc/hintids.hxx
	sw/inc/ndhints.hxx
	sw/inc/txatbase.hxx
	sw/inc/unobookmark.hxx
	sw/inc/unofield.hxx
	sw/inc/unoport.hxx
	sw/source/core/access/accpara.cxx
	sw/source/core/bastyp/init.cxx
	sw/source/core/crsr/bookmrk.cxx
	sw/source/core/crsr/findtxt.cxx
	sw/source/core/doc/dbgoutsw.cxx
	sw/source/core/doc/docbm.cxx
	sw/source/core/doc/doccorr.cxx
	sw/source/core/doc/docdde.cxx
	sw/source/core/doc/docedt.cxx
	sw/source/core/doc/docfld.cxx
	sw/source/core/doc/doclay.cxx
	sw/source/core/doc/tblrwcl.cxx
	sw/source/core/docnode/ndcopy.cxx
	sw/source/core/docnode/nodes.cxx
	sw/source/core/docnode/section.cxx
	sw/source/core/edit/edfld.cxx
	sw/source/core/fields/docufld.cxx
	sw/source/core/fields/postithelper.cxx
	sw/source/core/fields/reffld.cxx
	sw/source/core/inc/MarkManager.hxx
	sw/source/core/inc/crossrefbookmark.hxx
	sw/source/core/text/inftxt.cxx
	sw/source/core/text/itratr.cxx
	sw/source/core/text/txtfrm.cxx
	sw/source/core/txtnode/atrfld.cxx
	sw/source/core/txtnode/ndtxt.cxx
	sw/source/core/txtnode/thints.cxx
	sw/source/core/undo/undel.cxx
	sw/source/core/undo/undobj.cxx
	sw/source/core/unocore/unofield.cxx
	sw/source/core/unocore/unoport.cxx
	sw/source/core/unocore/unoportenum.cxx
	sw/source/filter/html/htmlatr.cxx
	sw/source/filter/html/htmlgrin.cxx
	sw/source/filter/html/wrthtml.cxx
	sw/source/filter/writer/writer.cxx
	sw/source/filter/ww1/fltshell.cxx
	sw/source/filter/ww8/wrtw8nds.cxx
	sw/source/filter/ww8/ww8par.cxx
	sw/source/ui/dialog/uiregionsw.cxx
	sw/source/ui/dochdl/swdtflvr.cxx
	sw/source/ui/docvw/PostItMgr.cxx
	sw/source/ui/docvw/SidebarWin.cxx
	sw/source/ui/fldui/fldmgr.cxx
	sw/source/ui/fldui/fldref.cxx
	sw/source/ui/inc/fldmgr.hxx
	sw/source/ui/inc/wrtsh.hxx
	sw/source/ui/shells/textfld.cxx
	sw/source/ui/uiview/view2.cxx
	sw/source/ui/utlui/navipi.cxx
	sw/source/ui/wrtsh/wrtsh2.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.cxx
	writerfilter/source/dmapper/DomainMapper_Impl.hxx
	writerfilter/source/dmapper/PropertyMap.cxx
	xmloff/inc/txtfldi.hxx
	xmloff/source/text/txtfldi.cxx
	xmloff/source/text/txtparae.cxx

Change-Id: Ie4cc467dbb837054c73742262ee20f35c151ff3f

Change-Id: I70493afcec837411b0f3c6d5165564d2cc0996db

This reverts commit 58ea2712.
It's probably better to fix it another way.

Change-Id: Iba1416692a619c1f566f26da5b06ed04342057b3

Change-Id: I2d8aab3f4589750aecb0a9565c595a712fc7bc73

This has no effect on the rendering of this .ui as native button ordering is
active. But it means that under the typical editing-under-GNOME that ones head
is wrecked from the cognitive impedance of the editor and viewer not matching
in order

Change-Id: I8888d4263f05bcecff72496f4cf0ae67345dc644

Change-Id: I6e51951df3bff0d1829bff8e2a436e4030247baf

Change-Id: I0bf9116d088adde838993ac5e909a6f3481f883e

Change-Id: Ia1a9593e3d1dbc41cf25f6a983cb340f48538226
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>

Change-Id: I81c62c0a3ed880c0523e6ae54a27da56ff5acdca

Change-Id: I1dd51df0e78a3cc89cdfcaec91ffd9a753393e2e

Change-Id: Ia3e2b5e682a64844bb6c713912c50c7681393d52

...as always, the question is where exactly to place the mutex guard, but
without it querying for XServiceInfo of a freshly instantiated
"stardiv.one.form.component.Edit" (i.e., OFormattedFieldWrapper) would lead to
failing

> DbgTestSolarMutex () at include/tools/debug.hxx:295
> OutputDevice::ImplGetGraphics (this=0x2b81dc11e680) at vcl/source/gdi/outdev.cxx:560
> OutputDevice::DrawRect (this=0x2b81dc11e680, rRect=Rectangle = {...}) at vcl/source/gdi/outdev.cxx:1649
> OutputDevice::ImplDrawColorWallpaper (this=0x2b81dc11e680, nX=0, nY=0, nWidth=1, nHeight=1, rWallpaper=...) at vcl/source/gdi/outdev6.cxx:778
> OutputDevice::ImplDrawWallpaper (this=0x2b81dc11e680, nX=0, nY=0, nWidth=1, nHeight=1, rWallpaper=...) at vcl/source/gdi/outdev6.cxx:1083
> OutputDevice::Erase (this=0x2b81dc11e680) at vcl/source/gdi/outdev6.cxx:1144
> VirtualDevice::ImplInitVirDev (this=0x2b81dc11e680, pOutDev=0x28dc0a0, nDX=1, nDY=1, nBitCount=0, pData=0x0) at vcl/source/gdi/virdev.cxx:114
> VirtualDevice::VirtualDevice (this=0x2b81dc11e680, nBitCount=0) at vcl/source/gdi/virdev.cxx:136
> ImpEditEngine::SetRefDevice (this=0x2b81dc045f10, pRef=0x0) at editeng/source/editeng/impedit2.cxx:195
> ImpEditEngine::ImpEditEngine (this=0x2b81dc045f10, pEE=0x2b81dc0c8a00, pItemPool=0x2b81dc0a0960) at editeng/source/editeng/impedit2.cxx:156
> EditEngine::EditEngine (this=0x2b81dc0c8a00, pItemPool=0x2b81dc0a0960) at editeng/source/editeng/editeng.cxx:104
> frm::RichTextEngine::RichTextEngine (this=0x2b81dc0c8a00, _pPool=0x2b81dc0a0960) at forms/source/richtext/richtextengine.cxx:103
> frm::RichTextEngine::Create () at forms/source/richtext/richtextengine.cxx:52
> frm::ORichTextModel::ORichTextModel (this=0x2b81d866ff30, _rxFactory=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at forms/source/richtext/richtextmodel.cxx:66
> frm::ORichTextModel::Create (_rxFactory=uno::Reference to (cppuhelper::ServiceManager *) 0x2b813a25a260) at forms/source/richtext/richtextmodel.cxx:243
> cppu::OSingleFactoryHelper::createInstanceEveryTime (this=0x2b819d66a6a0, xContext=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at cppuhelper/source/factory.cxx:171
> cppu::OSingleFactoryHelper::createInstanceWithContext (this=0x2b819d66a6a0, xContext=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at cppuhelper/source/factory.cxx:203
> cppu::OFactoryComponentHelper::createInstanceWithContext (this=0x2b819d66a638, xContext=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at cppuhelper/source/factory.cxx:432
> non-virtual thunk to cppu::OFactoryComponentHelper::createInstanceWithContext(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) () at cppuhelper/source/factory.cxx:433
> cppuhelper::ServiceManager::createInstanceWithContext (this=0x2b813a25a208, aServiceSpecifier="com.sun.star.form.component.RichTextControl", Context=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at cppuhelper/source/servicemanager.cxx:979
> non-virtual thunk to cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) () at cppuhelper/source/servicemanager.cxx:987
> frm::OControlModel::OControlModel (this=0x2b81d8679408, _rxContext=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8, _rUnoControlModelTypeName="com.sun.star.form.component.RichTextControl", rDefault="com.sun.star.form.control.TextField", _bSetDelegator=0 '\000') at forms/source/component/FormComponent.cxx:593
> frm::OBoundControlModel::OBoundControlModel (this=0x2b81d8679408, _rxFactory=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8, _rUnoControlModelTypeName="com.sun.star.form.component.RichTextControl", _rDefault="com.sun.star.form.control.TextField", _bCommitable=1 '\001', _bSupportExternalBinding=1 '\001', _bSupportsValidation=1 '\001') at forms/source/component/FormComponent.cxx:1273
> frm::OEditBaseModel::OEditBaseModel (this=0x2b81d8679408, _rxFactory=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8, rUnoControlModelName="com.sun.star.form.component.RichTextControl", rDefault="com.sun.star.form.control.TextField", _bSupportExternalBinding=1 '\001', _bSupportsValidation=1 '\001') at forms/source/component/EditBase.cxx:57
> frm::OEditModel::OEditModel (this=0x2b81d8679408, _rxFactory=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at forms/source/component/Edit.cxx:296
> frm::OEditModel_CreateInstance (_rxFactory=uno::Reference to (cppuhelper::ServiceManager *) 0x2b813a25a260) at forms/source/component/Edit.cxx:280
> cppu::OSingleFactoryHelper::createInstanceEveryTime (this=0x2b819d66a5c0, xContext=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at cppuhelper/source/factory.cxx:171
> cppu::OSingleFactoryHelper::createInstanceWithContext (this=0x2b819d66a5c0, xContext=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at cppuhelper/source/factory.cxx:203
> cppu::OFactoryComponentHelper::createInstanceWithContext (this=0x2b819d66a558, xContext=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at cppuhelper/source/factory.cxx:432
> non-virtual thunk to cppu::OFactoryComponentHelper::createInstanceWithContext(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) () at cppuhelper/source/factory.cxx:433
> cppuhelper::ServiceManager::createInstanceWithContext (this=0x2b813a25a208, aServiceSpecifier="com.sun.star.form.component.TextField", Context=uno::Reference to (cppu::ComponentContext *) 0x2b813a244dd8) at cppuhelper/source/servicemanager.cxx:979
> non-virtual thunk to cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) () at cppuhelper/source/servicemanager.cxx:987
> frm::OFormattedFieldWrapper::ensureAggregate (this=0x2b81d8879818) at forms/source/component/FormattedFieldWrapper.cxx:342
> frm::OFormattedFieldWrapper::queryAggregation (this=0x2b81d8879818, _rType=invalid uno::Type) at forms/source/component/FormattedFieldWrapper.cxx:164
> cppu::OWeakAggObject::queryInterface (this=0x2b81d8879818, rType=invalid uno::Type) at cppuhelper/source/weak.cxx:281
> frm::OFormattedFieldWrapper::queryInterface (this=0x2b81d8879818, _rType=invalid uno::Type) at forms/source/component/FormattedFieldWrapper.hxx:68
> com::sun::star::uno::BaseReference::iquery (pInterface=0x2b81d8879818, rType=invalid uno::Type) at include/com/sun/star/uno/Reference.hxx:43
> com::sun::star::uno::Reference<com::sun::star::lang::XServiceInfo>::iquery (pInterface=0x2b81d8879818) at include/com/sun/star/uno/Reference.hxx:58
> com::sun::star::uno::Reference<com::sun::star::lang::XServiceInfo>::Reference (this=0x2b81d8663a98, rRef=...) at include/com/sun/star/uno/Reference.hxx:158

Change-Id: I16ebbb2caf4f0fe943c9e43bddde03b5a2627e35

Change-Id: Ida54a46580fb3d1ec49ea5daeb55c0235d2bf85a

Change-Id: I9fd91ee8c15479e9956daa5c85a09f141ef6cc3f

Change-Id: I3b165e2a4414fd3d6c3cede5eb39beffa9fe7576

in UICategoryDescription::getElementNames

(cherry picked from commit e4eb0147)

Change-Id: Ib5a2e14ecb446c339afe5e53be435478845a4024

(cherry picked from commit 3acdfc0f)

Conflicts:
	sfx2/source/dialog/mgetempl.cxx

Change-Id: I61faf0195d8ee8976e85bcf1a49561eeebc72b39

Change-Id: I668b4f0b767d3a93a1407ae4ba7922235815a28b

Change-Id: I6269f199bddcf13c1e412b14f9a5935c62c63fe0

Project: help  d9e8232f139ed14b155d2b8455718758056c3b26

Change-Id: Ia6aef40daa81e76051fd5b6ce7d4e38da1262b25

Change-Id: I208f5892f6fb54d53ed4d17ddb189f0a24051a17

Cause:
 - Extra space gets added in document due to default <rPr>
   is getting removed from <pPr>.
Implementation:
 - The 'rPr' inside 'pPr' means the properties of the 'paragraph marker'.
 - In that case - the paragraph marker will have different formatting then
   the rest of the runs in the paragraph.
 - Added default rpr tag in pPr.

Reviewed on:
	https://gerrit.libreoffice.org/7216

Change-Id: I5a1a1f251ccc5b555ea6bf3bac3e69af8b2b69b5

Change-Id: Iffefd979cbe5c3ba8daafa92e33e9a288d2d906c

Change-Id: Ie6f5f2a634171d9618f3229bcc18ad48fff80d35

Change-Id: I7c25cd94f8a1ca339f7423c26f21f13c7a68906d

Change-Id: I1c7cb32819d70efaf470247c86e0ee8dcb3f9087

Change-Id: Ib9656b8e321a12a6f971f5775aaed235eac8df58

This changes bring it back to the same algorithm used in 3.5.

Change-Id: I16855cef1de133a1f886baa823d5b0d2b148e781

Change-Id: I9cbe647563699b9b610661003084d2cd16093f9a

Change-Id: Iddde39da57db0d6be9f066f3e2bdb0526932edc6

This resolves the originally reported issue in that bug (in Comment 1).

Change-Id: I6fb85cff1eafb78d784605aa08e7d992a1ac36e0