lets try this hack, if it fails revert and I'll just
manually update the baseline with a newer flex than
flex-2.5.4a-41.fc6

Change-Id: If644489e80fc4e4cdba97808af0fe4d544d08646

in typedescription.h

(cherry picked from commit a0809605)

Conflicts:
	cppu/inc/typelib/typedescription.h

Change-Id: I4ef735b896dc0833733e0141ce4c3fefcb820ded

reshuffle declarations in typedescription.h to make forward-decls redundant

(cherry picked from commit 0a6ba29e)

Conflicts:
	cppu/inc/typelib/typedescription.h

Change-Id: I91486656606464c7e76fa349a02d45a96c0cfb4d

Change-Id: I44b505f977edcf9e0af2108487870352277ee9f0
Reviewed-on: https://gerrit.libreoffice.org/4011Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

Change-Id: I988439f8be9822c73d19c292da37e2cb102b1c78

Change-Id: I0138c2186741acf0964f0166953b69872a822907

Change-Id: Ia71b1fe2d75f0b53c091be5adcd975c8e64e3393
Reviewed-on: https://gerrit.libreoffice.org/3969Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Change-Id: I4e2c942b4bc51199c37efac4ad29dc08f3bbdcd3

Change-Id: I4b6a27a72f76d0d22f4104004468292c19a190ce

Patch by: Kai Labusch
Review by: arielch, jsc
(cherry picked from commit de751733)

Conflicts:
	offapi/com/sun/star/text/XTextMarkup.idl
	sw/inc/unoflatpara.hxx
	sw/inc/unotextmarkup.hxx
	sw/source/core/unocore/unoflatpara.cxx

Change-Id: I2cfa15f08a893feb8880dc729b76cff3d29ce4eb

Patch By: Kai Labusch
Review by: arielch, jsc
(cherry picked from commit 5da75c78)

Conflicts:
	sw/source/core/inc/wrong.hxx
	sw/source/core/txtnode/fntcache.cxx

Change-Id: Ibc609ce4ef3492b537bb1ddec5ff7c460eb2c573

Patch by: Kai Labusch
Review by: arielch, jsc
(cherry picked from commit c1fb6ce1)

Conflicts:
	offapi/com/sun/star/text/makefile.mk
	sw/inc/unotextcursor.hxx
	sw/source/core/unocore/unoobj.cxx

Change-Id: I68029b28908a57c4ed39d798269b5a8786972be0

with additional parameter to increase flexibility of context menus

Patch by: Kai Labusch
Review by: arielch, jsc
(cherry picked from commit 5898e201)

Conflicts:
	svx/source/mnuctrls/SmartTagCtl.cxx

Change-Id: I91d50b94657c29db289864863ee752d4ce45db6c

for SmartTags

Patch by: Kai Labusch
Review by: arielch, jsc
(cherry picked from commit a64c066b)

Conflicts:
	offapi/com/sun/star/smarttags/XSmartTagRecognizer.idl
	offapi/com/sun/star/smarttags/makefile.mk
	svx/inc/svx/SmartTagMgr.hxx
	svx/source/smarttags/SmartTagMgr.cxx
	sw/source/core/txtnode/txtedt.cxx

Change-Id: I11f528b2c1a068d0b1db1e76c2f889c0632ab972

Change-Id: I6b0932ecd304e661e3331b22e6993b856b686982

Project: dictionaries  96569b9f3d03502c5108eb4db7eb3e0697535617

Change-Id: I60345ed3eed84ef197bf145f2b26dfa8afdc51b1

Change-Id: Iae582b8733254233517dbbf20a9293041b2f9b6d

since 9830fd36

Change-Id: I2cf7e59676d36fb0fe1a1ea4b70fa96d2a9ba976

Change-Id: I1339767de7980426d32960bf5ee60e2f5c011be4

from ExtensionDependencies

(cherry picked from commit 3484496e)

Conflicts:
	officecfg/registry/data/org/openoffice/Office/ExtensionDependencies.xcu

Change-Id: I1b2e7382837a4cfad667187a7f930ca54385c31e

This reverts commit d256dbed:

For one, the new css.chart2.XTitle2 looked unfinished, in that it transfered the
direct properties of the old-style css.chart2.Title service into attributes, but
left out all the properties inherited by the old-style service from
css.style.ParagraphProperties, css.drawing.FillProperties,
css.drawing.LineProperties (and that missing FIXME css.layout.LayoutElement,
whatever that is supposed to be).  This needs more thought, to either make
available all propertiers as attributes, or none.

For another, this broke JunitTest_chart2_unoapi (sch.ChXChartDocument,
sch.ChartTitle), for hard-to-debug reasons.

Conflicts:
	chart2/source/model/main/Title.cxx
	chart2/source/model/main/Title.hxx
	offapi/com/sun/star/chart2/XTitle2.idl
	sc/source/filter/inc/xlchart.hxx

Change-Id: I4747208a13984904d0e409ea49a73b0f667c86c7

Change-Id: Id3aa47866fb753fb6a08d9dfcfb0ecb34d4a4770

(cherry picked from commit 15bffb38)

Conflicts:
	instsetoo_native/util/openoffice.lst.README

Change-Id: Icdfbab74f437aa1179d24c251ecf74a79e4e522d

Make it more readable by adding a table

(cherry picked from commit e7b7b284)

Conflicts:
	offapi/com/sun/star/ucb/Content.idl

Change-Id: I31d3fc46993cad81d57ba15f77b8fbc797e4c541

Project: help  e5ca2e81fcd42d619b728374f9c4e25b66032eac

Project: help  50666498dd7c499a6c95c52ceef8a4f1075cc88f

I was overloading ApplyDXArray() with a HarfBuzz specific implementation
because the GenericSalLayout one was screwing right to left kerning, but
it seems to have broken left to right full justifications. Since
mnXOffset was introduced a bit earlier to fix a similar issue, it can
now be used here as well to minimize the possible side effects.

Seems to work fine for both left to right and right to left text now,
but at least one of my Arabic tests is regressing, so might need some
tweaking.

Change-Id: I1239b0ec77a4978f981a480400a6d01cda18af79

Change-Id: I274d0a8392d51937630704b721953b407e7c3e91

Change-Id: Ib541799e5bd8c95878d61dadbad2bcca80d44367

When creating a new Splitter ImplInitHorVer(bool) should always
init all state independent from the current state because some
variables might not be initialized yet.

 Conditional jump or move depends on uninitialised value(s)
    at 0x8293625: Splitter::ImplInitHorVer(bool) (split.cxx:70)
    by 0x82936DF: Splitter::ImplInit(Window*, long) (split.cxx:100)
    by 0x8293CC3: Splitter::Splitter(Window*, long) (split.cxx:157)
    by 0x2686BC48: ScTabSplitter::ScTabSplitter(Window*, long, ScViewData*) (tabsplit.cxx:28)
    ...
  Uninitialised value was created by a heap allocation
    at 0x4A08361: operator new(unsigned long) (vg_replace_malloc.c:298)
    by 0x2687D8F1: ScTabView::Init() (tabview5.cxx:90)
    by 0x2686C5D3: ScTabView::ScTabView(Window*, ScDocShell&, ScTabViewShell*) (tabview.cxx:261)
    ...

The public method to change the internal state is Splitter::SetHorizontal()
which does check the current state (and calls Splitter::ImplInitHorVer()
only when there is a real state change). So the bNew != mbHorzSplit was
redundant anyway.

Change-Id: If84e8bff4c87d208416de3583202ce88d6982a99
Reviewed-on: https://gerrit.libreoffice.org/4007Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Change-Id: I36793cf0144de5e051d277e70457f36dbfc933ff

...the constructors with SAL_NO_ACQUIRE argument do the same.

Change-Id: I5c893080c9ae14e9e7ecefb726f3d99fce67ec81

Change-Id: I0b7433431c2da50c17f46549cde30b2b0131c61f

should have higher priority than that from table style

Found by: Jinlong Wu,wujinlong@gmail.com
Patch by: bjcheny,companycy@gmail.com
Review by: zhangjf

(cherry picked from commit fe7e723a)

Conflicts:
	writerfilter/source/dmapper/DomainMapper.cxx

Change-Id: I3f4c96d49de40b21cc3da9bcb5e588a270434cd8

Change-Id: I7398272de0bd340ebfb5f31b314d32fcff007eec
Reviewed-on: https://gerrit.libreoffice.org/3974Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

- Add mouse rollover handling code to vcl::MenuBarWindow and vcl::Menu
- Add member variable of rollover color to StyleSettings and ImplStyleData
- Add rollover color definitions for each platforms

Change-Id: I9ececd8a7089918ac63c5f2027c0c2f361a9d227
Reviewed-on: https://gerrit.libreoffice.org/3856Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Accelerator 'o' is used for Open as well as Other,
'r' isn't used as accelerator in that dialog.

Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6
Reviewed-on: https://gerrit.libreoffice.org/4004Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

Change-Id: Ib815c1a84efa4682ad644132ad3704f249b04a68

Add missing Key Tab in
/org.openoffice.Office.Writer/AutoFunction/Completion/AcceptKey

(cherry picked from commit 4ff43c2b)

Conflicts:
	officecfg/registry/schema/org/openoffice/Office/Writer.xcs

Change-Id: I3441a9b97f3e74c115bde84da9a1c85f9c901185

(cherry picked from commit 9314f61d)

Conflicts:
	offapi/com/sun/star/text/XAutoTextContainer.idl

Change-Id: If775043efb6dae9832cbfd347f206278f3abb44c