Revert "Up"

This reverts commit aff3bb25c3d3591c9e34ef04c5eb1043ee55d311.

Up
Merge branch 'AOO42X' of https://gitbox.apache.org/repos/asf/openoffice into AOO42X

(cherry picked from commit 3eac5e1a06ced5fbc1bce9fa16090e1d47c1b67e)

bump all


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1850902 13f79535-47bb-0310-9956-ffa450edef68

Changed %PRODUCT_RELEASE% for SDK from 4.2 to 4.2.0

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1806161 13f79535-47bb-0310-9956-ffa450edef68

Removed unused graphics in SDK, minor changes in HTML

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1784055 13f79535-47bb-0310-9956-ffa450edef68

Further HTML code cleanup, removed unused graphic

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1783682 13f79535-47bb-0310-9956-ffa450edef68

Changed %PRODUCT_RELEASE% for SDK from 4.2.0 to 4.2, removed unused graphics, fixed typos, changed makefiles

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1783451 13f79535-47

Changed %PRODUCT_RELEASE% for SDK from 4.2.0 to 4.2, removed unused graphics, fixed typos, changed makefiles

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1783451 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Changed %PRODUCT_RELEASE% for SDK from 4.1 to 4.2.0

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1783309 13f79535-47bb-0310-9956-ffa450edef68

#i122362# remove stlport4-build support

but keep the --without-stlport configure option for now
it is the new default anyway


git-svn-id: https://svn.apache.org/repos/asf/op

#i122362# remove stlport4-build support

but keep the --without-stlport configure option for now
it is the new default anyway


git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1543067 13f79535-47bb-0310-9956-ffa450edef68

show more ...

increase version number (4.1.0) to differentiate trunk from the released 4.0.1 version

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1537973 13f79535-47bb-0310-9956-ffa450ede

increase version number (4.1.0) to differentiate trunk from the released 4.0.1 version

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1537973 13f79535-47bb-0310-9956-ffa450edef68

show more ...

#122482# make boost optional and adapt settings

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1491828 13f79535-47bb-0310-9956-ffa450edef68

#122482# remove STLPORT macro from seetings.mk, add msvcprt.lib

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1490620 13f79535-47bb-0310-9956-ffa450edef68

#121388# - adapt renaming: "Apache OpenOffice" --> "OpenOffice"



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1448713 13f79535-47bb-0310-9956-ffa450edef68

i119977 - Update version number to 4.0.0

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1442743 13f79535-47bb-0310-9956-ffa450edef68

#121388# - Adapt naming "OpenOffice.org" --> "Apache OpenOffice"
-- impact on corresponding strings in the UI, folder names, package names, ...



git-svn-id: https://svn

#121388# - Adapt naming "OpenOffice.org" --> "Apache OpenOffice"
-- impact on corresponding strings in the UI, folder names, package names, ...



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1431253 13f79535-47bb-0310-9956-ffa450edef68

show more ...

odk - Update PRODUCT_RELEASE to reflect trunk

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1417864 13f79535-47bb-0310-9956-ffa450edef68

odk - Remove support for tcsh shell

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1417862 13f79535-47bb-0310-9956-ffa450edef68

119098: add, remove old, adapt new license header to work in makefiles

git-svn-id: https://svn.apache.org/repos/asf/incubator/ooo/trunk@1302973 13f79535-47bb-0310-9956-ffa450edef68

Reduce the dependencies on non standard GNU copy.

Excessive dependence on GNU cp for non-GNU platforms is inconvenient
as it involves installing the complete GNU coreutils package. This

Reduce the dependencies on non standard GNU copy.

Excessive dependence on GNU cp for non-GNU platforms is inconvenient
as it involves installing the complete GNU coreutils package. This
can be avoided by using less non-portable extensions.

- "cp -R" tends to be more portable than "cp -r"
- Avoid using "cp -u".

At this time this changes are focused on FreeBSD based
on the work done already for MacOSX.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ooo/trunk@1238684 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Update headers to Alv2 headers

git-svn-id: https://svn.apache.org/repos/asf/incubator/ooo/trunk@1232676 13f79535-47bb-0310-9956-ffa450edef68

make initial branding changes

git-svn-id: https://svn.apache.org/repos/asf/incubator/ooo/trunk@1231878 13f79535-47bb-0310-9956-ffa450edef68

Update headers to Alv2 headers

git-svn-id: https://svn.apache.org/repos/asf/incubator/ooo/trunk@1229816 13f79535-47bb-0310-9956-ffa450edef68

118568: replace license incompatible lcc with ucpp

git-svn-id: https://svn.apache.org/repos/asf/incubator/ooo/trunk@1209396 13f79535-47bb-0310-9956-ffa450edef68

Initial import of the old OOo hg repository tip revision.

.../trunk/main is a copy of (currently tip-most)
http://hg.services.openoffice.org/OOO340/rev/c904c1944462

.../trunk/

Initial import of the old OOo hg repository tip revision.

.../trunk/main is a copy of (currently tip-most)
http://hg.services.openoffice.org/OOO340/rev/c904c1944462

.../trunk/extras/l10n is a copy of (currently tip-most)
http://hg.services.openoffice.org/master_l10n/OOO340/rev/af6bc9467af5

Note that the following files with line-end and/or encoding anomalies were left out (they will need to be to be checked in separately):

/ooo/trunk/core/dictionaries/de_DE/README_hyph_de_DE.txt
/ooo/trunk/core/dictionaries/de_CH/README_hyph_de_CH.txt
/ooo/trunk/core/dictionaries/de_AT/README_hyph_de_AT.txt
/ooo/trunk/core/gettext/gettext-0.18.1.1.patch
/ooo/trunk/core/apache-commons/patches/codec.patch
/ooo/trunk/core/libcroco/libcroco-0.6.2.patch
/ooo/trunk/core/testautomation/writer/optional/input/import/mactext.txt
/ooo/trunk/core/graphite/graphite-2.3.1.patch
/ooo/trunk/core/hwpfilter/source/hwpeq.cpp
/ooo/trunk/core/solenv/bin/cwstouched.pl
/ooo/trunk/core/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
/ooo/trunk/core/writerfilter/source/doctok/escher.html
/ooo/trunk/core/writerfilter/source/odiapi/qname/resource/office2003/WordprocessingML Schemas/xsdlib.xsd
/ooo/trunk/core/writerfilter/source/odiapi/qname/resource/office2003/WordprocessingML Schemas/wordnetaux.xsd
/ooo/trunk/core/filter/source/xslt/odf2xhtml/export/common/body.xsl
/ooo/trunk/core/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl

Also: Repository.mk from the l10n toplevel


git-svn-id: https://svn.apache.org/repos/asf/incubator/ooo/trunk@1162288 13f79535-47bb-0310-9956-ffa450edef68

show more ...