Conflicts:
	desktop/prj/build.lst
	helpcontent2
	l10ntools/Executable_gsicheck.mk
	l10ntools/Executable_uiex.mk
	regexp/inc/regexp/reclass.hxx
	solenv/gbuild/AllLangResTarget.mk

Change-Id: I398f0cd9e7daefa8d2e04fd977d5bc2e9708169b

Project: translations  b2cf0bf6fb5d098ed7997099349b74de8fb5e1f1
initial import of LibreOffice 4.0 translations

Change-Id: I98f35920f02d4ee71787a9968158b220af69bde6

Change-Id: I7bc54a295c7155a1a173c28f45118a6d2983d0d2

Change-Id: Icdafde88e3984cf3689f591216a890392892dfce

The functionality in comphelper/configuration.hxx is used by C++ headers to
simplify configuration access that are generated via
officecfg/Package_cppheader.mk.

Change-Id: I85d26309ec8c4f8ac5cde773fd3298a699bad030

Change-Id: Ieb04a22f83e698521aa90fe16fce4f66c4635034

Change-Id: I0af154bc5bc6cc79ab45a85a5a06e4539442ec81

Project: help  66abeb18556b468ea3d97cea78dcd8e9f0c94380
translations is a source-only module

Change-Id: I4b6ce49aa5e6d391e832dc1023e47d694a480948

Change-Id: I71b74ceabfdaced541529143d15d020ac17d2e26

Terribly sorry to revert this - but the UX-advise consensus is to show the
rulers by default.

This reverts commit ae991a10.

This is a rework of f9059d4e "Key all browser
plugin features to --enable-nsplugin."  The problem with that was that Mac OS X
supports pluging browser plugins into LO documents (which was originally
controlled by --enable-mozilla) but not plugging LO into browser windows (which
was originally controlled by --enable-nsplugin), so controlling the former with
the same switch as the latter did not actually work.

Thus I replaced the single ENABLE_NSPLUGIN feature flag with two dedicated ones,
ENABLE_NPAPI_FROM_BROWSER (for plugging browser plugins into LO documents) and
ENABLE_NPAPI_INTO_BROWSER (for plugging LO into browser windows).  The
--enable-nsplugin configure switch is gone completely, setting the feature flags
is always done fully automatically now.

Change-Id: Iecf706637465e865c987563b5de489fa90b4c904

It seems that previously onCreate served 3 different purposes:

1) bootstrap UNO machinery
2) load the document
3) create the view

Ideally it should do the first two only if not done already -- as a
first step, this commit extracts 1) and does only once.

Change-Id: I087a6b934c05295263080f571c95ef152e4602cb

This is not C++ source.

Change-Id: I05fe98ef019df23fd4be0d7e281ebb877b545484

Change-Id: I47ce1502e8ffd58709a64a3ca520d59cb765bfaa

Change-Id: I92a82a29fe217faaefe7e67228d59a9fb43526d5

Change-Id: I43ddfad9a91484551763fd6e3a89f17382b7a392

Change-Id: I291baa1e78d0033d242b407f96f37cdbab9fe62b

Change-Id: I788437db6a4031ee6ff406fcf56c5765158285dc

This commit removes some @author annotations and some cleanup.

Change-Id: Iaf2c4465825dc73af6c1d7377ae847262721c22b
Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1122Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>

Change-Id: Icc13eb7a8c6720ac53163e3ee7842a22c2862ab3

Project: help  a6e68151d44f357d5828d3a75193d67863226b12
Fix dependacies in help

Qtz has no own po files so use one of
configured langauge's po files (en-US excludex)
Plus copy all properties files independently of
localization

Change-Id: Ica7ccb7d3111f2fc2b3bbde4b839cb564967130a

just as the po file belong to it

Change-Id: Ia5deea8816cbb5fc29669d6aa8c3c81472b0ed3f

Change-Id: I28aff5533ec6cc31a3d6f3de3198452bd716ba62

Change-Id: Ieeebc4098404fa006d66bb8b656172a4348b1dc1

Change-Id: I7533098781b0b6987cd852d74a688aac6e0af056

Change-Id: I70155825cb591b9ef60d82d81e2a51e9e25b96e4

Change-Id: I95ee1f5c04571c692e8e7ef7faa75fcae76eef93

    Patch contributed by: Jurgen Schmidt
    remove onlineregistration with dependencies
    http://svn.apache.org/viewvc?view=revision&revision=1240245
    imported patch package_eventlistener.patch
    http://svn.apache.org/viewvc?view=revision&revision=1172103

    Patch contributed by Pedro Giffuni
    Accept Google Chrome OS fonts as equivalent to MS fonts.
    http://svn.apache.org/viewvc?view=revision&revision=1233155
    http://svn.apache.org/viewvc?view=revision&revision=1233408

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

    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: #i114600#: remove forbidden characters
    from list of unencoded characters
    http://svn.apache.org/viewvc?view=revision&revision=1172370

    Patches contributed by Oliver Rainer-Wittman
    some clean up in JPEGReader due to memory constraints
    http://svn.apache.org/viewvc?view=revision&revision=1299729
    119114 - method <UpdateDialog::addSpecificError(..)> - create
    entry with correct type
    http://svn.apache.org/viewvc?view=revision&revision=1305265

    Patches contributed by Ariel Constenla-Haile
    i118707 - make toolbar control's popup window grab focus
    http://svn.apache.org/viewvc?view=revision&revision=1225846

    Patches contributed by Herbert Duerr
    #i118662# remove usage of BerkeleyDB in desktop module
    http://svn.apache.org/viewvc?view=revision&revision=1213171
    minor cleanups in dp_persmap.*
    http://svn.apache.org/viewvc?view=revision&revision=1215064
    flush early to prevent problem with extension manager not
    cleaning up its objects
    http://svn.apache.org/viewvc?view=revision&revision=1228147
    i118726 do not flush *pmap file while reading it
    http://svn.apache.org/viewvc?view=revision&revision=1230614
    #i119048# migrate BDB extension entries using a simple heuristic
    http://svn.apache.org/viewvc?view=revision&revision=1300972
    #i119048# handle edge cases when importing BDB hash files
    http://svn.apache.org/viewvc?view=revision&revision=1301428
    #i119113# fix of-by-one when importing BDB files
    http://svn.apache.org/viewvc?view=revision&revision=1305420

restore our encryption settings, icon themes, and dictionaries.
removed wrapper hacks, kill obsolete bundled extension blob /
pre-registration handling, remove duplicated quickstart code.
remove OS/2 conditionals.

This reverts commit 1d38dbab.

Conflicts:
	desktop/source/app/app.cxx

This reverts commit e700031c.

Change-Id: I9062aafa2fefa26b7b1edf0440f4675b2f469e5d

Change-Id: I4c55e30ec64f4e4d0217f226bc99ff693d054093

Change-Id: Iee8328a695b554d97f6805b64b98706b9e3d7ab9

Change-Id: I41411301ee131f92b9725208e53133ee0f8a6f82

we use git submodules, so it makes more sense (hopefully)

Replaced options:
    --no-lo-pieces with --no-submodule
    --piece=<piece> with --module=<module>

Removed hopefully unused option:
    --no-lo-core

Change-Id: Icbf742991ccda2f7833a5b50d51cb1421885383d