Patches contributed by: Armin Le Grand.
    #118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task.
    http://svn.apache.org/viewvc?view=revision&revision=1195906
    #118485# - Styles for OLEs are not saved.
    http://svn.apache.org/viewvc?view=revision&revision=1182166
    #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles
    http://svn.apache.org/viewvc?view=revision&revision=1293316
    #119337# Solves the wrong get/setPropertyValue calls in
    SvxShapeText (and thus in SvxOle2Shape)
    http://svn.apache.org/viewvc?view=revision&revision=1344156

    Patches contributed by Mathias Bauer (and others)
    gnumake4 work variously
    http://svn.apache.org/viewvc?view=revision&revision=1394707
    http://svn.apache.org/viewvc?view=revision&revision=1394326
    cws mba34issues01: #i117717#: remove wrong assertion
    http://svn.apache.org/viewvc?view=revision&revision=1172349

    Patch contributed by Herbert Duerr
    goodbye Registration and License dialogs, don't let the door hit you
    http://svn.apache.org/viewvc?view=revision&revision=1172613
    help gcc 4.6.0 on 32bit ubuntu 11.10"
    http://svn.apache.org/viewvc?view=revision&revision=1245357

    Do not add targets for junit tests when junit is disabled.
    Patch contributed by Andre Fischer
    http://svn.apache.org/viewvc?view=revision&revision=1241508

Revert "sb140: #i117082# avoid unncessary static class data members
    commit 21d97438.
remove obsolete FreeBSD visibility special case.
retain consolidated BSD bridge code, remove OS/2 pieces.

This reverts commit d3794d2d.

Conflicts:
	bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
	bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx
	bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
	bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
	bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx

This reverts commit bb157a42.

This reverts commit 335f7fa8.

Conflicts:
	framework/source/layoutmanager/toolbarlayoutmanager.cxx

on XTypeProvider::getImplementationId"

This reverts commit 27b9f9f3.

Conflicts:
	xmloff/inc/xmloff/txtparae.hxx
	xmloff/source/style/SinglePropertySetInfoCache.cxx

Conflicts:
	xmloff/source/style/PageMasterExportPropMapper.cxx

Change-Id: I50f5b8c95d82781029f3ae3dda1865dea9b336d5

Change-Id: I121b9f8822afc379a619eaa52c5e050457f1d8c3
Reviewed-on: https://gerrit.libreoffice.org/1082Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

Change-Id: I54bf71bdd7e088ab5c11234ec31963817a314006

Change-Id: Ied60932e1a0e66b9721afbfd186f05e188edb70c

Change-Id: Id67be2a0722930094c61ad99912934ebce5a4631

Change-Id: I044bae6995f78ea70dea9da101036a6cf578d48f

Change-Id: Ida46affca95fcd582206d79ff7a5b4d48ed92e12

Change-Id: I6a42370873708e4b016e75829064da6080acf811

Any rotated text in an emf image (image size != original size),
has thicker fonts.
This is kind of a regression caused by commit
8c2902ec
So, partially reverted it.
The code was kind of a workaround/copy-paste, so I am assuming
it is safe to revert.

Side-effects: The dotted borders (in calc) look a
little lighter and not so very visible in the page-preview.

Change-Id: Ia4494c3a1164026f5da25d2040a5cc187016b958

Change-Id: I041d58d09e132e481cfa278300c494c9f1d75f29

The check itself was always failing unless you added 0x to cxxflags
and we can safely assume the header to be there.
If the header fails during compile time it throws nice
error explaining what is going on anyway.

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

Change-Id: Idbe03cbc209db9951d0dbdb19e4e5e7e184fdb76
Reviewed-on: https://gerrit.libreoffice.org/1027Reviewed-by: Stefan Knorr <heinzlesspam@gmail.com>
Tested-by: Stefan Knorr <heinzlesspam@gmail.com>

Change-Id: I0d67eedf37dc561aa8a8944e0670607e71723824

tabs creeped in with b4d1aaa0

Change-Id: Idb73a4db82970a3af06e7d50e4d71d4a3ece44cf

For one, /etc/opt/ure was probably never used by anyone anyway, so meant just
needless file-stats during startup.  For another, accidentally created
~/.ure/javasettings_*.xml that later became stale were noted to cause trouble,
so that source is now closed.

For this to work, jvmfwk needs to be silent now if it cannot read/write any
shared/user javasettings_*.xml.

Change-Id: I332b5ebb9549dc6ccf7c99c439d9a3b61aeb5829

Change-Id: Ia172f144616d7468466a057bb1a431b3047209fd

This reverts commit 78c7bbc3.

It is no longer the case that both expat_utf8 and expat_utf16 are linked
into the same library: we only use expat_utf16 in shell Explorer
extensions, which cannot be linked into libmerged anyway.

Conflicts:
	expat/expat-2.1.0.patch

Change-Id: I579c10d405d8a40cafcb2dbe09e967c6079f7b16

Change-Id: I5536d92c381a0df425a7d70387f1ebc457e68186

... seeing as there isn't actually a handler in the compileExtensionHelp
function; possibly dead code there.

Change-Id: I96b3edff6be2d58d0c1852eb1043547c33e97c3a

Change-Id: Id2d476c4fc13ccfb501ef920f75e2a95a7ce3734

Just compile those files twice.
Also rename the UTF8 library to plain "expat".
This allows python to simply use that library and build "pyexpat"
succesfully.

Change-Id: I7e37ec5b87b70c2cf8c86e06709f0e8d0a67f09d

Change-Id: Ia9b5b2775ad91661bf3d130417a1624fa4d855d2

Change-Id: I532558f5502898e036e01d64faa854c68e7109c9

Change-Id: If204523d7da544b11b2d809993ada180476104ef

Change-Id: I63b0510fea80c12579985fbc4d4eb4646376e25b
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1074Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

Change-Id: I6bbb57bfc46fe6afe5652a1c83097d4f18e5ed03

Change-Id: I4a445c345706351da8f022180d142249340acd2f

Change-Id: I3e6c1341666fddcfd1bd272a0943ca1de3e5d629
Reviewed-on: https://gerrit.libreoffice.org/1072Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>

Also create a utility constructor for LocaleDataWrapper, which
simplifies many of the calling sites.

Change-Id: Ic8510b51c4201fa17fc0620e18d3e258e43636ba

I upgraded the service to return XSimpleFileAccess3, since it
already implemented that interface, and it's backwards
compatible.

Change-Id: I40001a46048bd21a23b6a2f58a95376f06fc634b

Modify the service to return XExtendedTextConversion,
since that is backwards compatible and the service
implements it.

Change-Id: I2923969135c396d643c501ed56e0528c0bd7c14a