Commit Graph

234 Commits

Author SHA1 Message Date
1731f6e692 bump apache-commons-lang to 3.3.1
Change-Id: Ibae9d3d143e111c0bb60de76deb085a3ccb010c9
2014-03-25 13:06:34 +00:00
3dad9b1019 bump apache-commons-codec to 1.9
Change-Id: Ia5638f4c4cc47121610b8ddff144fb88aff6b96f
2014-03-25 13:06:34 +00:00
2b15c85a8c bump apache-commons-logging to 1.1.3
Change-Id: Ibeebcc8616a3547f2e2dbf4d613ce4c02ba9d176
2014-03-25 13:06:34 +00:00
dbc78f2e41 Resolves: fdo#75308 Asterisk at the beginning of Paragraph without "Nowiki"
The fix of fdo#74875 brings a huge regression since nowiki must be used
With this patch, fdo#74875 is still ok hopefully.

Change-Id: Ic6ed34630b40b09ab4f63166cbb1985b6313d168
2014-02-22 09:15:31 +01:00
9e2d1d21f9 Resolves: fdo#69925 Wiki Publisher Extension is not working
Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=b80d8c695e6b6ded231e67ed9a80bcd1f1250c03
"compareTo" has been replaced by "==", so we compared the equality ot the pointers on the objects instead of the content of the strings
To make it simple and since we compare String objects, let's simply use "equals" method

Change-Id: I65bc1a87751297411fdbe722d3f49bce5e291638
2014-02-19 22:23:58 +01:00
e4a448a9c7 Related: fdo#74875 Filter of "nowiki" to be improved - Export to MediaWiki
<nowiki> mustn't be called almost everytime. Now this part still need some work (rework?)

Change-Id: I9a01c1e2fb51a51e0737296117db892e3b3b9ce6
2014-02-12 22:10:46 +01:00
7d2f7c6d7e normalize values of SYSTEM_APACHE_COMMONS, SYSTEM_BSH
Change-Id: Ia6adb8ae07ec80e83bc67084dfbd0bc6136ed8b7
2014-02-12 09:53:11 +01:00
7da3f43e63 Resolves: fdo#74820 Failed to recognized Heading 6-Export to MediaWiki
See http://www.mediawiki.org/wiki/Help:Formatting

Change-Id: I6cf50e957d3aef6bff6e86a031da175d5544e98c
2014-02-11 22:41:27 +01:00
ac6e8ac7e4 typo fixes in comments
Change-Id: Idd49478d59cd062118fbf8e99d1c8bc5250013fc
2014-02-06 23:22:30 +01:00
5b609aebc4 gbuild: fix gb_Extension_use_default_description
Passing a target local variable like $(LOCATION) to
gb_Extension_add_file does not result in an actual dependency on the file.

Change-Id: Ide77ab81f19877267056bf8e50d69c9cfedcda79
2013-11-04 13:19:55 +01:00
a60427ef5a swext: fix wiki-publisher / apache-commons build
gb_Extension_use_package is inherently broken because it creates cyclic
dependencies with gb_Extension_add_file.  Fortunately it's not necessary
because the added file is a target by virtue of being in the Package.

There is another cyclic dependency that can be avoided by not using the
Package in gb_ExternalProject__use_commons-logging.

Change-Id: Id4ddd4f78d819e47882387533a2d64693b2879ea
2013-10-26 21:39:18 +02:00
461d830ed8 stop using apache-commons jars from OUTDIR too
Change-Id: I0d9282cd3a267ad2d25b43adbf995365aaa56fa1
2013-10-25 23:31:30 +02:00
8e602afd1e stop looking for Jar files in solver
Change-Id: I4d2a93fa7395354fbf2893df9e254ab39fa365af
2013-10-25 11:42:40 +02:00
c801ab3676 xsltml: remove ExternalPackage, use files from WORKDIR
Change-Id: Ib2ca7cbf15fd374fd822fa096e0e3f3502598245
2013-10-24 17:56:05 +02:00
fa5c7ccff4 Fix path for common-update.dtd
Change-Id: If87cb8da51bb85b6b1f4af166a6bbb6005bde55b
2013-10-04 19:02:08 +02:00
c871c0695c ENABLE_MEDIAWIKI Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I4561c2cd3b937cbd0085d1e94930d5f458281d11
Reviewed-on: https://gerrit.libreoffice.org/5704
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-08-30 19:59:29 +00:00
805c6101b3 Resolves: #i121544# - Clean-up MessageBox API
(cherry picked from commit 27cfcb1e9d103b3e49c1263b1fa59fee8b187b21)

Conflicts:
	desktop/test/deployment/active/active_native.cxx
	desktop/test/deployment/passive/Dispatch.java
	desktop/test/deployment/passive/passive_native.cxx
	odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
	odk/examples/DevelopersGuide/GUI/MessageBox.java
	odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
	odk/examples/java/Inspector/Inspector.java
	offapi/com/sun/star/awt/MessageBoxButtons.idl
	offapi/com/sun/star/awt/MessageBoxResults.idl
	offapi/com/sun/star/awt/XMessageBox.idl
	offapi/com/sun/star/awt/XMessageBoxFactory.idl
	offapi/com/sun/star/awt/makefile.mk
	offapi/type_reference/types.rdb
	sdext/source/minimizer/unodialog.cxx
	toolkit/inc/toolkit/awt/vclxtoolkit.hxx
	toolkit/source/awt/vclxtoolkit.cxx
	toolkit/source/layout/core/root.cxx

Change-Id: I170b494fb96362bb25ba8d0f2518d4e46934dd67

Related: #i121544# - Clean-up MessageBox API (post fix)

(cherry picked from commit c9f7a06e7798bcd5253844c49d210ea9345bd4b8)

Conflicts:
	sw/inc/pch/precompiled_sw.hxx

Change-Id: Ib8b1e7aaac769feff5206fcdd238c487a6130dd1

Related: #i121544# - Fix header guards

Found by: Tsutomu Uchino

(cherry picked from commit 82194a19ff4f29c8451c8e6ab6fe4f1b9d08df27)

Conflicts:
	offapi/com/sun/star/awt/MessageBoxType.idl

Change-Id: Ide8ba697fbc80395d2f30a068a0820a6afa3332f
2013-07-11 13:16:58 +01:00
680608b15d Related: #i121513# Remove deprecated UnoControlThrobberModel
(cherry picked from commit 5569d97f06a0299e41b91ca248bf7eaa038b1f21)

Conflicts:
	icon-themes/human/toolkit/source/awt/spinner03-grey_01.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_02.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_03.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_04.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_05.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_06.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_07.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_08.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_09.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_10.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_11.png
	icon-themes/human/toolkit/source/awt/spinner03-grey_12.png
	offapi/com/sun/star/awt/UnoControlThrobber.idl
	offapi/com/sun/star/awt/UnoControlThrobberModel.idl
	offapi/com/sun/star/awt/XThrobber.idl
	offapi/com/sun/star/awt/makefile.mk
	offapi/type_reference/typelibrary_history.txt
	offapi/type_reference/types.rdb
	rat-excludes
	swext/mediawiki/help/component.txt
	swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
	swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
	swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
	swext/mediawiki/src/description.xml
	toolkit/AllLangResTarget_tk.mk
	toolkit/inc/toolkit/helper/servicenames.hxx
	toolkit/source/awt/vclxtoolkit.cxx
	toolkit/source/awt/xthrobber.cxx
	toolkit/source/awt/xthrobber.hrc
	toolkit/source/awt/xthrobber.src
	toolkit/source/controls/tkthrobber.cxx
	toolkit/source/helper/registerservices.cxx
	toolkit/source/helper/servicenames.cxx
	toolkit/src2xml/src.lst
	toolkit/util/toolkit.xml

Change-Id: Ic415a96fe6ba7040a3b03fd562f997d2df1516d6
2013-07-05 10:03:52 +01:00
bc0e857b96 Resolves: #i121907# upgrade odt2mediawiki to latest version
upstream changed license to ALv2

Besides the license change, there are two bug fixes:
* Do not apply any transformation to the contents marked as WikiMath.
* Join sibling nodes marked as WikiMath.

Patch by: Bernhard Haumacher

(cherry picked from commit 414a61fa4c4f03a2b2645682c55ee56ae9c84a79)

Change-Id: I6b996631ebdd908c6d96d2c9dde1a3d6dd3e212f
2013-05-12 17:07:54 +01:00
72e5d0c8fb Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-30 13:34:06 +01:00
a79d43dcd7 Java cleanup in mediawiki extension
- remove unnecessary casts
- convert Hashtable->Map and Vector->ArrayList
- remove dead fields

Change-Id: Id85abee74857325a113133bf61474b962256489c
Reviewed-on: https://gerrit.libreoffice.org/3430
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-19 07:51:15 +00:00
b80d8c695e fdo#62096 - replace some O(U)String compareTo with ==
Change-Id: I98d04d7da4c2b7ea0b769df9c2bfa8c1ad86bf2d
Reviewed-on: https://gerrit.libreoffice.org/3422
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-04-17 10:01:35 +00:00
adda54b521 Update Apache Commons
Update commons-codec to version 1.6.
Update commons-lang to version 2.4.
Patch common-httpclient to avoid building issues
with OpenJDK-7.

These versions maintain ABI compatibility while
using features from newer Java versions and
have been tested on the FreeBSD port.

Change-Id: I6aec2b6d22fc3335ffbdda9558f475313ef53c85
2013-03-26 17:07:07 +01:00
33a87b9339 fdo#61379 Java options are under Options - LibreOffice - Advanced
Change-Id: Ic7b262f4b75e7f2069f88f753cea5ff8f59610b7
2013-03-23 12:03:00 +01:00
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
12f9287bca Make gb_Extension_use_default_description/license explicit
...as a prerequisite for gbuild'ifying desktop/test/deployment/passive/, which
builds a test extension that does not match those default description/license
settings.

Change-Id: I200ff0ceb9750ed4b1c187305f10469f789d29cb
2013-03-07 11:13:59 +01:00
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
6ac759dde1 remove specialcasing for old internal sun wiki
Change-Id: Idb8efc3f900172dea2ded6b7aa39e0b6f8fe49b7
2013-02-25 13:00:00 +01:00
616c6924f1 s/the the/the/
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2013-02-22 09:58:19 +02:00
31170413ae API CHANGE: com.sun.star.lang.IllegalArgumentException
... derives from com.sun.star.uno.RuntimeException instead of
com.sun.star.uno.Exception.

Only test that breaks with this change is jurt_uno/AnyConverter_Test,
which for mysterious reasons effectively tests that
IllegalArgumentException is a subclass of Exception and not
RuntimeException.  Presumably this is just a generic exception test that
happens to use IllegalArgumentException.

Some further testing indicates there are no problems expected at
runtime:
Running "make subsequentcheck" with all Java test code compiled against
a ridl.jar that does not contain the change, running against a soffice
that uses ridl.jar and rdbs with the change + ridl.jar with the change
on the test side yields exactly the same AnyConverter_Test failure, with
no other failures.

Change-Id: Iad183de76ec7e0d56648084e97cdcc160b5b033d
2012-11-26 23:14:33 +01:00
117fdb9898 convert users of XDocumentInfo to XDocumentProperties
Change-Id: I10f395f90d554d0ec26fe9f2654ae839e21c7ee5
2012-11-22 12:10:30 +01:00
06ec1c0895 Merge branch 'master' into feature/killsdf
Conflicts:
	Repository.mk
	RepositoryFixes.mk
	connectivity/prj/build.lst
	extensions/prj/build.lst
	filter/prj/build.lst
	fpicker/prj/build.lst
	l10ntools/StaticLibrary_transex.mk
	saxon/build.xml
	shell/prj/build.lst
	solenv/gbuild/AllLangResTarget.mk
	solenv/gbuild/Configuration.mk
	solenv/gbuild/UI.mk
	ucb/source/ucp/webdav/webdavcontent.cxx
2012-11-11 18:24:14 +01:00
428d9e15f9 Delete unused files
Belong to extensions which become
unneeded because of treex

Change-Id: I86ca7494a9022c1e72d64b2ec5cbd41d6e292a00
2012-11-07 22:59:15 +01:00
cffdb8d680 gbuild: fix XcuMergeTarget build breakage:
Introduce gb_XcuFile_for_extension function to use the right file
depending on WITH_LANG setting.

Change-Id: Ibe4fc4e28fe445fc9391b68d370039528eab7ed8
2012-10-23 22:58:56 +02:00
10f4e767f0 gbuild: let ExtensionTarget expect manifest below META-INF
Change-Id: Ia07d3fd856578ab6976c02f8a0ec96273db19a2c
2012-10-23 19:42:37 +02:00
72e2db3aba Correct helptree localization in swext
Change-Id: I6d30e96cb9fb0a0800e0b3b0eaa58b98de4d9010
2012-10-14 17:22:24 +02:00
39bac3f6c0 translations is a source-only module
Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4
2012-10-01 15:19:10 +02:00
4a2503e5a6 set paths in help tree file of MediaWiki extension help
we set the paths here to their runtime values, because in new
build "paradigm" English tree is not updated, just copied. No
problem with that, we'll fix regressions later. Now it works
even in en-US build, but nodes are not localized, because
update_tree.pl does not find localizations due to the changed
paths. update_tree.pl is a hack and must die. It will be killed
in feature/killsdf branch.

Change-Id: Ic16eca538182f5548d4d6c2a23f9bc9764da6b62
2012-09-25 21:23:38 +02:00
eaa81cc2f0 move help compiler/linker/indexer to a new module
we may want to use syntax highlighter class from svtools later,
which is not available for l10ntools

Change-Id: I5a06b77cb6935e3ef68015fb608aa26ac7c53fac
2012-09-16 20:41:26 +02:00
4c9e62c6e3 Java cleanup, convert ArrayList and Vector to use generics
Change-Id: Ic668b46872ee0bfd259ca335aed9d68fb545c3a4
2012-09-10 23:43:39 +02:00
6bf09ecf1d Java cleanup, remove unnecessary imports
I guess I missed some last time :-)

Change-Id: I164a8baa07850f783b8cdf2e7f3eeaac53a3d29b
2012-09-10 23:43:38 +02:00
7017654a70 add help.tree files to extensions' help
Change-Id: I2decf0178dea2722a752291f21e97cae4aab8074
2012-09-10 21:33:21 +02:00
ec5fb295b0 The *_develop.zip files appear to be unused
Change-Id: I1bb3d359b087421f4acf67955549514fc3c6a236
2012-08-31 18:31:24 +02:00
b23bb8e0de fdo#53009: Compile extension help in gbuild
...as had been done in the old build system (solenv/inc/extension_helplink.mk).
Especially for bundled extensions, this removes the need to compile the help
data per user on first start.

gb_Extension_add_helpfile(s) replaces gb_Extension_localize_help, and takes care
of all the steps (localization, compilation, inclusion in .oxt), even for the
en-US data (which was handled with additional gb_Extension_add_file calls
before).

Change-Id: Ie4bab66d3cad2b713780a23bf2606ca56cfff37f
2012-08-31 17:04:43 +02:00
5a4bcd3b75 gbuild: register all jars
Change-Id: I9f49970e5e06d1afd3fc066a20d1671c93e262fc
2012-08-17 12:52:25 +02:00
999f7fb840 swext: use gb_Jar_use_externals
Change-Id: Ib62473d841bc9a66acde6529d3f63e3fd1a00928
2012-08-15 21:29:15 +02:00
cdbd6957a5 gbuild: remove most uses of gb_Jar_set_jarclasspath:
With gb_Jar_add_jar and gb_Jar_add_system_jar adding to the manifest
classpath automatically it is no longer necessary to call
gb_Jar_set_jarclasspath manually except for the URE jars, which
are apparently not supposed to be added automatically.

Change-Id: I1e743e7ecb9cb5651e02005aa09e127bea1b0a29
2012-08-15 21:29:14 +02:00
ec54c0c45f re-base on ALv2 code. 2012-07-03 13:10:11 +01:00
2005a34318 re-base on ALv2 code. 2012-06-29 15:51:49 +01:00
b6db3e3acc re-base on ALv2 code.
Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1
2012-06-21 13:11:06 +01:00