summaryrefslogtreecommitdiff
path: root/scp2
AgeCommit message (Collapse)AuthorFilesLines
2015-02-10On Mac OS X, directly name the executable "unopkg"Stephan Bergmann1-13/+0
Change-Id: I5f846d7f7c5ed54179504f551e19227f7283bda2 (cherry picked from commit 57e6d742a9e2aeb11b179122991e7d35ca54543c) Reviewed-on: https://gerrit.libreoffice.org/14397 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-02-03fdo#67534 Fix "Property Handler" shared lockMaxime de Roucy1-0/+18
As explained in the following link, access mode should be set to "EnableShareDenyNone" to avoid blocking others process to access the file opened by the Property Handler. http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3 Reviewed-on: https://gerrit.libreoffice.org/13596 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/14301 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-01-07Include the new templates in the installation.Jan Holesovsky2-0/+32
All the templates are result of the Templates contest for 4.4, and were contributed under CC0. The templates were contributed by the following people: * Alexander Wilms <f.alexander.wilms@gmail.com> * Edmund Laugasson <edmund.laugasson@gmail.com> * Jun NOGATA <nogajun@gmail.com> * Michael Kovarik <fractalsandflowers@gmail.com> * Péter Szathmáry <mi84aa@gmail.com> * Zirk <showeet@ymail.com> Thank you (and all the other participants) for your contributions! install the new templates too (cherry picked from commit 9da59f23a0b100454bdc4c663db82a61f1d7ec30) Change-Id: I9fa578fafa5e350a186a77b3e023474b289e0fb8 Reviewed-on: https://gerrit.libreoffice.org/13806 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-12-22scp2: typo in source/impress/module_ogltrans.ulfAndras Timar1-1/+1
Change-Id: I3f2849784107a046bcf05e6cfb3b0b8d2f535912 (cherry picked from commit 48d0ca8560d10a56a7280fad3a631985b02a56b9) Reviewed-on: https://gerrit.libreoffice.org/13595 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-14add redist files for VS 2013Andras Timar2-0/+31
Change-Id: I07c7af3b9b7d3335074d712c35cef9d7828a271b
2014-11-12Fix common typos. No automatic tools. Handmade…Andrea Gelmini1-1/+1
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-11-06fdo#82038: senddoc, uri-encode got lost on MacStephan Bergmann1-1/+1
Change-Id: I2f104c64601b22ce3ef078295c7da3cb21a133f9
2014-11-06use %PRODUCTNAME in Windows registry keys of config filesAndras Timar1-1/+1
Change-Id: I532a1b059239b51009ea7025fb348dcd865748ff
2014-11-05Mac OS X: Add back into installset LibreOffice.app/Contents/MacOS/ filesStephan Bergmann3-3/+16
...that were erroneously removed with 6492c8576e0393f7ee548cd938e84c80e8d37127 "Make the 'Mac-like' or 'canonical' app bundle structure always used on OS X": * gengal script (ultimately calling gengal.bin); this script still needs adaption to the new LibreOffice.app layout, though! * python script (ultimately calling Python.app) * unoinfo script * unopkg symlink to unopkg.bin (which could be dropped for Mac by renaming unopkg.bin to just unopkg, similarly to soffice/soffice.bin) Change-Id: Ic3eb340a183388939b1c812faf7fb509c9f53a8a
2014-10-31scp2: move unx wrapper scripts to AutoInstallMichael Stahl12-58/+6
Change-Id: I661656e486b088c28b78e5c3ed4fbe9945991097
2014-10-31scp2: forgot to remove file_quickstart from makefileMichael Stahl1-1/+0
Change-Id: Ieb34db019c03e7f20f06d3a690b3717b41645e90
2014-10-31scp2: move WNT executables to AutoInstallMichael Stahl5-34/+8
Change-Id: I3e541053faf956dc0cd2a3f068cd93b73fcaab6d
2014-10-31scp2: move unix/gnome executables to AutoInstallMichael Stahl5-68/+2
Change-Id: I0e0c3b5e3f130093f430f47c1730580105718c1e
2014-10-29scp2: remove EXENAMEMichael Stahl1-2/+0
Change-Id: I045a65d4efbaf8fcb55318ffce4f8929e2fbbe15
2014-10-29scp2: move writer executables to AutoInstallMichael Stahl5-15/+11
Change-Id: Ibcfdd7a8c204a1ec90045ad39ef456237ba80a34
2014-10-29scp2: move math executables to AutoInstallMichael Stahl5-6/+11
Change-Id: I8cb04121c52eb62e837c6a80037f9eabfc573dde
2014-10-29scp2: move impress executables to AutoInstallMichael Stahl5-5/+8
Change-Id: I312a9921e8760ee93282ef0706469fdea3fabea9
2014-10-29scp2: move draw executables to AutoInstallMichael Stahl5-5/+12
Change-Id: I6f7642a39fb72cfed85638cdd9015bf0aced8a20
2014-10-29scp2: move calc executables to AutoInstallMichael Stahl5-6/+11
Change-Id: Id69718fbdf429a4e9196e8b9c5c8a71171ad0847
2014-10-29scp2: move base executables to AutoInstallMichael Stahl5-15/+9
Change-Id: I772bbfc05d4f8fd38df7a75d3b0982c843be2524
2014-10-29installer: let's make missing FileID a fatal errorMichael Stahl2-14/+4
... because the upcoming AutoInstall conversions introduce dependency from FolderItem to auto-installed executables, and we want to ensure that that keeps working. Change-Id: I08d4aeddd28b93f080e201716597315e9a6ec2d6
2014-10-29scp2: move python executables to AutoInstallMichael Stahl2-10/+4
Change-Id: I94919f11150f39148219afc613ced99f74c539c0
2014-10-29scp2: move xpdfimport executables to AutoInstallMichael Stahl2-9/+1
Change-Id: I9b75436a03c06252530bbd54a7011fb553ceb9be
2014-10-29scp2: move brand executables to AutoInstallMichael Stahl3-53/+9
... except for soffice.exe which is referenced by some FolderItem. Change-Id: Ie5788aa950f0b8526220fb2c8b9281ce934b8a5d
2014-10-29scp2: move crashrep executables to AutoInstallMichael Stahl4-20/+8
Change-Id: Ib9fba534491ce67d329a375a359eef4520c0a3a1
2014-10-24make Korean ReplaceSingleQuote the same as everyone elseCaolán McNamara1-8/+0
I can find no evidence that Korean out of all languages on earth needs a different default for ReplaceSingleQuote This appeared in commit e9f10288e0e5f2519ff3da1e2de2c20a99fd9779 Date: Mon Jul 5 12:32:15 2004 +0000 2004/06/07 18:46:25 jb 1.14.78.1: #i25937# Add module settings (migrated from scp2) to xcu source files but that's a migration of the original GID_CONFIGURATIONITEM_SWRITER_KOREAN_ENABLE_SINGLEQUOTE which existed in the original scp (pre scp2) and appeared between OpenOffice.org 1.0 and 1.1.5, but the cvs repos to explain all that are long dead and there is no sign of a bug in a bugzilla query, so it suggests this was an internal StarOffice thing. Change-Id: I14dfe75d28d3ec5a68b262f768c7dbe73e94131d
2014-10-23remove --without-ppds option nowCaolán McNamara1-2/+0
This was intended for the time we had a huge bunch of third party ppds, those are now long gone. SGENT42.PS is now the same as SGENPRT.PS since commit 871d8e0f278dab646e1877a505577edc730a26cf Date: Mon Nov 25 14:13:40 2013 +0000 Resolves: rhbz#188467 default to Type42 so get rid of that one, leaving just the single SGENPRT.PS fallback ppd Change-Id: I851f25b2789b8aa101acd18193cd01e8cded4d09
2014-10-22scp2: fix language codes for sr-Latn and ca-valenciaAndras Timar1-5/+5
Change-Id: I0fe5d3b305c5105e987fcae90f2733b373fecc73
2014-10-08fdo#82288 merge core01-core07 packages into just oneChristian Lohmaier2-218/+150
The core package will obsolete the individual ones (of the same major.minor version) Change-Id: I30dea2c08ec7eca052db2706b7f9f30f91e37095
2014-09-29scp2: define BUILD_X64 for winexplorerext.Michael Meeks2-1/+5
Change-Id: I06c253cc53121559730f23906fd3ff34a4593d27
2014-09-28Fix 64914e407ccac9 - #endif/#else mixupChris Sherlock1-1/+2
Change-Id: Ia99ae45e66984ac0d88b6e9b6ca4514cd68f9634
2014-09-27vs2012 express support.Norbert Thiebaud5-2/+109
vs2012 express does not have atl so one need to --disable-atl and --disable-activex but then the packaging still try to include a few _x64.dll that are not built. Change-Id: I88ca5b9d23febd5a714fb48321dde5424cafceb6
2014-09-25scp2: remove some very SPECIAL unused macrosMichael Stahl1-11/+0
Change-Id: I28f2f4bc3c43aac1faf8be35cf7ce89480487102
2014-09-18Use instsetoo_native-generated uno ini-file for both instdir and instsetsStephan Bergmann1-81/+0
Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656
2014-09-17Fix incorrect pathname in commentTor Lillqvist1-1/+1
Change-Id: Icd5bbba4e20fb5fbd24fede1318a2dd21a673601
2014-09-17Correct the location of the URE unorc in scp2 for OS XTor Lillqvist2-1/+7
The URE unorc should be in Resources/ure/etc also when constructing an app bundle from scp2 data. Change-Id: Id33d20bda0175018b8340c686ae9cd47525cd401
2014-09-17BRAND_BIN_SUBDIR -> BRAND_INI_DIR, to cater for new Mac OS X layoutStephan Bergmann1-2/+2
Change-Id: Ic367545895a25a4cf6e95fc1be2f5db9f36a221b
2014-09-16Wrong URE_INTERNAL_LIB_DIR value for MACOSXStephan Bergmann1-1/+1
Change-Id: I3bb7310f42ee6ddf6217326589566cf4d4781e17
2014-09-16Wrong URE_INTERNAL_JAVA_DIR value for MACOSXStephan Bergmann1-1/+1
Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c
2014-09-16Wrong UNO_TYPES value for MACOSXStephan Bergmann1-3/+1
Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8
2014-09-16Rename LO-specific uno ini-file (Linux: program/unorc) to "louno"Stephan Bergmann2-38/+38
...to avoid confusion with the URE uno ini-file (Linux: ure/lib/unorc). It might even work to get rid of the louno ini-file altogether and fold its contents into the fundamental ini-file, but at least desktop/source/deployment/misc/dp_misc.cxx accesses the louno ini-file directly, so would need some inspection to avoid potential regressions. Change-Id: Ib49bbc4c814d677c22e68d2dd0f11af6d8423bb6
2014-09-11create a master document template typeCaolán McNamara1-0/+8
of application/vnd.oasis.opendocument.text-master-template with suffic otm https://lists.oasis-open.org/archives/office-comment/201002/msg00042.html desktop/icons/oasis-master-document-template.icns is just a copy of desktop/icons/oasis-master-document.icns because I can't draw Change-Id: I0d18c79c4c893e97505052884ee8be97d0f117a1 Reviewed-on: https://gerrit.libreoffice.org/11350 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-09-09fdo#45071: Remove ENABLE_NPAPI_INTO_BROWSER left-oversStephan Bergmann2-2/+0
...from previous commit Change-Id: I945faa6215f971ce817c6450fe0786da0696091f
2014-09-09fdo#45071 Remove Libreoffice browser pluginBryan Quigley3-23/+0
This removes ENABLE_NPAPI_INTO_BROWSER while it should keep ENABLE_NPAPI_FROM_BROWSER (embed flash in LO) intact. Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Conflicts: extensions/source/nsplugin/source/npshell.cxx Change-Id: I80a9159a75653c74423d8fdc7c188568d3188e04
2014-09-09Make the "Mac-like" or "canonical" app bundle structure always used on OS XTor Lillqvist18-108/+35
In other words, only executable files go in the MacOS folder. Dynamic libraries and bundled frameworks (i.e., LibreOfficePython), and nothing else, go in the Frameworks folder, and all other files go in the Resources folder. Especially, note that Java class files and rc (.ini) files also go in Resources. Such an app bundle structure is what Apple strongly suggests one should use, and it has been hinted that future versions of code signing and/or Gatekeeper will require such a structure. There is still some ugliness thanks to traces of the historical separation of URE from "the office". Like there are two separate "unorc" files, one for URE, one for the LibreOffice application. IMHO, this should be cleaned up, but is probably controversial. (Eek! I now see there are actually *three* unorc files in the app bundle. Not intentional. Need to fix that later.) Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
2014-08-18these strings should be translatableCaolán McNamara2-0/+7
so bring back scn.res and add them in there Change-Id: I378d64f524c64295d26223f54fe17950b475cd80
2014-08-17remove executable bitsThomas Arnhold1-0/+0
Change-Id: Iec785ae538de81325812b1e6fe33115789b39770
2014-08-15Another blind fix attempt for WNTTor Lillqvist1-0/+8
Change-Id: I369f3db3d72c93531e753b16fbd97abce4e1c0ed
2014-08-15Blind fix attempt for WNTTor Lillqvist1-0/+10
Change-Id: Iee1c5a5a1c9db5114b2b31cfac66d1a2d673a585
2014-08-15TypoTor Lillqvist1-1/+1
Change-Id: I9ba1a5679eb636103ccf7b34f120ed0d03903e76