summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-02-17WaE: unused variableprivate/Ashod/cp-5.0-preinitTor Lillqvist1-1/+0
Change-Id: I826a1eb45d0669dbe2495b4dbe4a171fcebb0865 (cherry picked from commit 220b25ba2711d2805b9927cd6b37468e619c6d30) (cherry picked from commit 9df6dc937674a93c3708c990acddf45411d01b36)
2016-01-29headless: don't let windows become really visible to avoid paints.Michael Meeks1-0/+4
Paint at the wrong time has a habit of allocating over-large OutputDevice's for the drawing layer; saves 7Mb of heap for a dummy tilebench document. Change-Id: Ie06df705a55faadea2b06fd24b904d95ae64fd83
2016-01-29headless: for now don't allocate big cairo surfaces for invisible frames.Michael Meeks1-0/+6
This was ~10Mb of RAM for a hello-world.odt under tile-bench. Change-Id: Ie0787676be754ac81eb8ec036c9757a1bb2f2220
2016-01-29Use a custom allocator for strings.Michael Meeks6-9/+86
Change-Id: I627d56b08a72187b15d7992c42179a05bef71c2b
2016-01-29preInitBootstrap call takes contextHenry Castro1-1/+1
Change-Id: I85b951f7d28d3d8af40b7d5f86b310021a079428
2016-01-28vcl: desktop terminate, to dispose objectsHenry Castro1-2/+9
In the preinit stage, the Desktop terminate() method is never called when lo_startmain thread is disposing objects. This produces debug assertions and osl assertions. It is forced to call terminate() method, when a tiled rendering case is active then it has a clean disposing objects process. However DBGGUI_DEINIT_SOLARMUTEXCHECK() check is moved at the end to prevent debug assertions solar mutex complains. Change-Id: I4a9b6398296d9150ab748a8d48868a08e7232909
2016-01-28vcl: assign NULL after deletingHenry Castro2-4/+8
In the preinit stage, the VCL initialization is done by the parent process and when the lo_startmain thread de-initialize the VCL, some services are disposed early, and it causes segmentation violation. So it is ensured that pointers to service objetcs is set NULL after the delete. Change-Id: I65ecfc2d2694a981ec2986988efabdfd28d0cce4
2016-01-28vcl: add isInitVCL, to not initialize twiceHenry Castro1-1/+11
In the preinit stage, the VCL is initialized in the parent process and when the lo_startmain thread is started, the thread initialize VCL again. It is not necessary to initialize twice. Change-Id: I819cf0125afe7760c3f4d91c420d36a3a383902c
2016-01-28cppuhelper: add preInitBootstrap symbolHenry Castro3-16/+30
In the preinit stage, the preInitBootstrap is called to load implementations for each service registered by the service manager. All service requests are: initial Component Context and the process service factory is set. However, some services require that VCL is properly initialized. Change-Id: Ib116e3da172b860f2df4d672f6181b5de0b7e6b2
2016-01-28cppuhelper: method 1, load implementations to invoke component factoryHenry Castro1-5/+81
In the preinit stage, for each library that is registered by the service manager, is loaded with the flag SAL_LOADMODULE_NOW and the component factory is invoked to initialize its data. Change-Id: Ie6f6d769b611c8440ddab802545e6bdc482d1476
2016-01-28Restoring preinitAshod Nakashian8-32/+163
Change-Id: I65341c57d00308d246ec90deab8050b2c4bb3e61
2016-01-28svg export - skip/rewind slide transitionMarco Cecchetti1-1/+85
The following actions messed up the animation engine if they were performed while a slide transition was running: - rewind/skip currect playing effect (Left/Right key) - rewind last/skip next effect (Up/Down key) - rewind/skip all effect (PgUp/PgDown key) - jump to first/last slide (Home/End key) Now: - Left/Up/PgUp key: rewind slide transition - Right/Down key: skip slide transition - PgDown key: skip slide transition and all new slide effects - Home key: skip slide transition and jump to first slide - End key: skip slide transition and jump to last slide Moreover the parsing of transition node properties missed to report some type of not supported transitions which caused the animation engine to hung. Change-Id: I7018b8e8fb3041a95cc80e250431b6544c875e98
2016-01-25sd lok: Fix normal 'search' performed after a 'search all'.cp-5.0-20Jan Holesovsky2-5/+19
The DBG_ASSERT followed by the same test actually returning immediately prevents the actual 'search' after a 'search all' being performed. I hope this does not have any negative consequences; but if it does, we should fix the root cause, instead of having this kind of defensive programming here. Change-Id: I909533f301dda9c20cab1968de45e5fa7975e852
2016-01-25Bump version to 5.0-20Andras Timar1-1/+1
Change-Id: Ia2895520794ab3cf7e7750e6df443c601f59ab67
2016-01-25sc: build fixAndras Timar1-4/+4
Change-Id: I21627d09f772d33b5ca45ae11624387b2bee3c28
2016-01-22sc lokit: update zoom values to graphic and text selectionHenry Castro1-2/+4
Change-Id: I750f31c5698d9dc5ed589a1812a6993991915dc5 Reviewed-on: https://gerrit.libreoffice.org/21724 Reviewed-by: Henry Castro <hcastro@collabora.com> Tested-by: Henry Castro <hcastro@collabora.com>
2016-01-22sw tiled rendering: avoid unnecessary invalidation in SwView::SetVisArea()Miklos Vajna3-2/+30
SwWrtShell's visible area is set to the entire document since 12e3b51abe883202af09769873f87b27d7de118b (tdf#94237 tiled rendering: Use the entire document as the visual area., 2015-09-15). Let's be consistent and do the same for SwView, so that SwView::PageDown() and all other similar functions do not cause unnecessary invalidations, as this way later we'll realize that SwView's and SwWrtShell's visible area is the same. (cherry picked from commit 7b48a8fb2f0a0d8b854ec00d5f03ec09e8cfa4da) Conflicts: sw/qa/extras/tiledrendering/tiledrendering.cxx Change-Id: Ia22f07ddfb18c6f5ab6cbafede7cf8799b1177a1
2016-01-21sw tiled editing: default to anchoring new images as-charMiklos Vajna2-0/+10
(cherry picked from commit e7eca35148204d094dcdb7d8b3e4ec6c9d454159) Conflicts: desktop/qa/desktop_lib/test_desktop_lib.cxx sw/source/uibase/wrtsh/wrtsh1.cxx Change-Id: I6aeb06fe1697b7a30e83a3b1b364f44e5822fe95
2016-01-21gtktiledviwer: try to paste as html, then as plain textMiklos Vajna1-1/+1
This commit (as a side effect) fixes LOKTransferable::getTransferData() to not assume that the string is null-terminated, so it makes sense to backport it even without gtktiledviewer. Otherwise rtl_str_getLength() will read memory up till it finds a 0 byte, so it might read uninitialized memory -> garbage at the end of the string. (cherry picked from commit 080bd44f0b0300075ff18d377f31deebbc4009ed) Conflicts: libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx Change-Id: I8e1c93fd36fb903c0625b29f9f73825438c9e113
2016-01-21sc lok: Implement unit test for .uno:{Insert,Name,Remove} for sheets.Jan Holesovsky3-4/+50
And fix indexing when at that - the inserting is 1-based, so let's be consistent in the .uno:Name and .uno:Remove too. Change-Id: Ib854e81551ae0a39d3ba7c68512e81ea227e9eb1
2016-01-21sc lok: Fix .uno:Remove (removing sheets) to accept a parameter.Jan Holesovsky2-21/+50
.sdi annouces that, but it was never implemented... Change-Id: I7abfbdc88f055eeb993617a5a51371af0f825d34
2016-01-21sc lok: Fix .uno:Name (renaming sheets) to really accept parameters.Jan Holesovsky2-3/+4
The code handles them, but they were unusable, because .sdi did not announce them. Change-Id: I35bd3009d092eb48a36aee2ffed3964dc61946e2
2016-01-20sc: Fix build.Jan Holesovsky1-0/+1
Change-Id: I496015f119b1e102528ac5ec5d27e896de25e56c
2016-01-19sc lokit: the visible row/column must be 0, when loading a documentHenry Castro1-4/+9
Change-Id: Ie980e0bb0726dd8bc4215d5b23ac6e1d2c9e2719 Reviewed-on: https://gerrit.libreoffice.org/21611 Reviewed-by: Henry Castro <hcastro@collabora.com> Tested-by: Henry Castro <hcastro@collabora.com>
2016-01-19Bump version to 5.0-19cp-5.0-19Andras Timar1-1/+1
Change-Id: I59783e40f3274c37bd8d77aaa333727a526e99e0
2016-01-19LOK: include ModifiedStatus in CALLBACK_STATE_CHANGEDMiklos Vajna2-2/+4
Change-Id: Ic44a9266a67bfad8b0490a8acb4a419af99ea42c (cherry picked from commit abbfbb4d35d6fa9edbb8f331a9d9503183eb0356)
2016-01-19CppunitTest_desktop_lib: add jpeg paste testcaseMiklos Vajna2-0/+24
Fails without commit 27c6b8586d5d2cd1fa5425b4969d915a0b739475 (svtools: implement clipboard import of JPEG files, 2016-01-19). (cherry picked from commit 802564e036db1ee3df8b19593b7f9f1be0deec54) Conflicts: desktop/qa/desktop_lib/test_desktop_lib.cxx Change-Id: Ic4e3b036b3a6a1c294bf15ef0b206cf1e458fc4e
2016-01-19svtools: implement clipboard import of JPEG filesMiklos Vajna1-0/+25
With this, lok::Document::paste("image/jpeg", "...") as invoked by gtktiledviewer results in a Writer image just like the previously already working PNG variant. (cherry picked from commit 27c6b8586d5d2cd1fa5425b4969d915a0b739475) Conflicts: svtools/source/misc/transfer.cxx Change-Id: I9e7b94043519db4ccf3c9ad32474a15275896dd4
2016-01-19sot: accept JPEG as a clipboard format where we accept PNG alreadyMiklos Vajna3-1/+45
(cherry picked from commit f731ecfd7bd3c703455e07447e9bb593e7b6e059) Conflicts: include/sot/formats.hxx sot/source/base/exchange.cxx Change-Id: I64602d31e8aa873e2280f86eaf618dd6007acaf1
2016-01-19Updated coreChristian Lohmaier1-0/+0
Project: help fd2137731a0361440b7b6a08ac28f6ef0e08aae9 <ahelp> should not be empty/self-closing element (<ahelp ../>) f5fa46ed8626910d710fd535518ddf9e756f9356 already fixed (tried to) the empty/self-closing ahelp tag, however <ahelp ..></ahelp> is merged to <ahelp .. /> by "make translations", so po files ended up with the self-closing form again. Surrounding a child/PCDATA with the tag solves the problem. (cherry picked from commit 8ecafdaa4e5b954941031e384b88c34309b7b27e) Change-Id: I58725f6a7e5999609262abec2987a6d05445a7b2
2016-01-19Updated coreRicardo Palomares1-0/+0
Project: dictionaries 2d2df105c0ba5b7ac4bf7c95b9ecffb3a2f94121 Bring shipped Spanish dictionary up to version 2.0 Change-Id: Iecc9e2d62bd72fa5cdcafe6f04343c611b056cff Reviewed-on: https://gerrit.libreoffice.org/21522 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 0d3b5e5314e68c3cf5d573b2e7bdc11143dcb821) Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-01-19tdf#96198 accept WEEKNUM with only one parameter, tdf#50950 follow-upEike Rathke1-2/+5
Loading ISOWEEKNUM(date) maps to WEEKNUM(date) so accept the actual ISOWEEKNUM parameter count defined in ODFF. This also ensures forward compatibility with 5.1 where 3e5deb8ccfaf0b73fb6cf394822e560dc036a686 (cherry picked from commit 15494f0f99d1cf6f75e8c2996377b242af247bbf) converts ISOWEEKNUM(date,mode) to real ISOWEEKNUM(date) if mode!=1 as there is no matching WEEKNUM(date,mode) defined. This WEEKNUM here never implemented the ODFF WEEKNUM but a mix of ISOWEEKNUM and something undefined different. Change-Id: Ibd0d4483486a1db28cc600821baae9f13b9dd687 Reviewed-on: https://gerrit.libreoffice.org/21118 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 3665652285f29021f4a12cc493fe8791b6afc126)
2016-01-18fix a crash found in passingCaolán McNamara1-1/+3
save a spreadsheet with an embedded formula in it to xlsx and alt tab away before the save has completed Change-Id: I9df996d4cb459a2aa688d06a7d53465518bebf5c (cherry picked from commit 50c2d561981d99abad9978811655365ff9884c87) (cherry picked from commit 12bc593da98be68961a9ea7d31619a7718fd1d4b) Reviewed-on: https://gerrit.libreoffice.org/21578 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 86a15daa99f57ddf5ddbdb2d67ed9d69e3bbbf37)
2016-01-18tdf#75256 - Sifr updatesMatthias Freund21-0/+0
Change-Id: I97a8f0df0548ec05b29c09d160d5f09ddd14a96f Reviewed-on: https://gerrit.libreoffice.org/21407 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit fb45376fea3e3d0ff0fc2af56d67efad1e7751cf) Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit afa9abd94f1d178e0204deb3d155287e61d350b1)
2016-01-18tdf#75256 Sifr updatesMatthias Freund25-0/+0
Change-Id: I693bc867c2c75141ebd061325e4d3c49011f6880 Reviewed-on: https://gerrit.libreoffice.org/21481 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit a05c5deba8c2540872712bdc49eee4441011e454) Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 85628a0ee494ab99dbd7a36ee76085318e6ed151)
2016-01-18tdf#65439: Export to PDF/A-1a gives transparency warningJulien Nabet2-16/+5
There was a use of transparency because Watermark was always defined Now we test if text of Watermark is empty or not Remark: it seems we don't cope not-text Watermark in pdf export (additional cleaning+renaming) Change-Id: I9d9c759a80c0a61e4f0a94c0fa295f2950caa3bc Reviewed-on: https://gerrit.libreoffice.org/20990 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Jan-Marek Glogowski <glogow@fbihome.de> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5c5017ea37e1bee205c6c1b9cafe753fcaf1a9a4) Reviewed-on: https://gerrit.libreoffice.org/21398 (cherry picked from commit e0a22b55c979edf703d42ea40a4b8b607e4ad24d)
2016-01-18Related: tdf#71622 compress more gfx in odf streamsThorsten Behrens1-1/+27
Except for jpeg and png, most natively-stored image fileformats compress rather well with zlib. adding a number of vector and pixel formats. Change-Id: I97407a98f620520b0d11552911d2339bf004dc5b Reviewed-on: https://gerrit.libreoffice.org/20461 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit ad0edc184792f3aa3f72e8d4ec8b76c3d1bf8479) Reviewed-on: https://gerrit.libreoffice.org/20467 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 26f62c80aa3684301e29dd17f9efba1bcd68264d) Reviewed-on: https://gerrit.libreoffice.org/21438 (cherry picked from commit cb72051d70a844077363d52a1a54d083136cde03)
2016-01-18update creditsChristian Lohmaier1-1693/+1702
Change-Id: I7d00e1eb3bb6d2da18ea2e6ae531aeb18e27c214 (cherry picked from commit e7d1b8a608096a1a999b9b610ce8862b0fbfc54a) (cherry picked from commit 35097f9a57a50ca6bd2d32c2f468d9b26bad4d1c)
2016-01-18Resolves: tdf#93703 0 scaling is CAIRO_STATUS_INVALID_MATRIXCaolán McNamara1-5/+8
so more drawing to the surface fails prior to 4ac876084bb89b6460b31e090a666b395f66b1e8 we had a new cairo context each time to the error was thrown away along with the context and the new one would work Change-Id: I90ab1a943e8908e87f391bdfb8ccd5f3818e13d5 (cherry picked from commit f22d153a07231f2d41c7be9ba0e6b7ce963a0762) Reviewed-on: https://gerrit.libreoffice.org/20852 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit cfaf07f88332dfe0476d559787c508a1688b5956)
2016-01-18tdf#90606 Crash when delete a large part of a column with shift cells leftArul1-6/+15
skipping splitFormulaCellGroup() and joinFormulaCellAbove() for nEndRow equal to MAXROW since nEndRow + 1 is not valid Change-Id: Iabfcb33bf58d20331841ca386cca4a91fd6598bf Reviewed-on: https://gerrit.libreoffice.org/21389 Reviewed-by: jan iversen <jani@documentfoundation.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 975ceab198a06558875006bbd9a4d0a2708e416e) Reviewed-on: https://gerrit.libreoffice.org/21393 (cherry picked from commit 293e7bef122fc5f5f4b9cc7719e22489913e8726)
2016-01-18tdf#94831: Check for null mpReadAccess before first useMatúš Kukan1-21/+18
There was erroneously added code before check in 45e8e0fbee40f9a8d91f4c559c8bbb16dd7b3f36. Change-Id: Ie2e84cfc061097c25e5d799e9c388abd9724bd93 (cherry picked from commit d5dcfe40ff3774d82a7b8f9f3d75b5b3cdac78ba) Reviewed-on: https://gerrit.libreoffice.org/21373 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 39f0277ba71c8f3834579003c046d12fa4650e8f)
2016-01-18tdf#95494 Calc can not sort Chinese word by stroke and radical,Jingtao Yan1-3/+3
_length must at the tail of filename. Change-Id: I434e89bf052d8f3130bfca62d71eaf8588c2bac9 Reviewed-on: https://gerrit.libreoffice.org/21213 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 1b683de366f4caf82225c632f02cf0f58ae76490) Reviewed-on: https://gerrit.libreoffice.org/21368 (cherry picked from commit 9059f747c50eaf99a3c065f90b598208edbcb86b)
2016-01-18tdf#92045 DOCX import: <w:effect w:val="none"/> doesn't mean blinkingMiklos Vajna3-1/+7
Regression from commit eeb8297e47bae11f2aeaa7bae6e51eee921e9e58 (Use constants for ST_TextEffect values, 2014-09-22), the problem was that while the tokenizer stopped using hardcoded token values, the matching dmapper code wasn't adapted. (cherry picked from commit ac6bfd85df271b650dbd24b45391dac346ecd72c) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Id61912e9c9458efc87e0a6f8e461663942c555f0 Reviewed-on: https://gerrit.libreoffice.org/21363 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a31708d9df01e7eae5c9ca39f4ee82fd6644dfe6)
2016-01-18tdf#96051: FILESAVE: Roundtrip any PPTX file with Shapes creates invalid OOXMLZolnai Tamás3-30/+6
Revert "bnc#584721: Import subtitle block to master slides" This reverts commit b3d50feaa87b670baf68288974005ac26ad31736. It seems the imported subtitle block makes export corrupt the output. Better to have a valid output. (cherry picked from commit a9db17aabc3ac970e6e4754e28310d20138144d9) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I1a3d4f03e4fa0c4431a5394495682a1b9d7677bc Reviewed-on: https://gerrit.libreoffice.org/20921 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e18c062be49042945644db438608a6e58c7dc98a)
2016-01-18tdf#96674 drawingML import: fix handling of zero width/height linesMiklos Vajna3-1/+22
(cherry picked from commit 627c2469843c9461b665c4571f1214aca7fc36a4) Change-Id: If3d9f6272031e08ab228cfa58963d60ceede2498 Reviewed-on: https://gerrit.libreoffice.org/21342 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit c5f4c528123d6c65b489ac18ab7892bc92866b09)
2016-01-18tdf#92623 Handle StartOfContent node for copying bookmarksJan-Marek Glogowski3-1/+60
For SwDoc::AppendDoc we use the StartOfContent node as the starting copy node to prevent merging of the first node in CopyRange and to get a 2nd node needed for CopyRange in case of single content node documents. This correctly counts StartOfContent as a non-copy node when adapting the bookmark ranges for copying. Change-Id: Ia3ee0328a1be5548f8751aa2240812c4662fb73f Reviewed-on: https://gerrit.libreoffice.org/20383 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 689962feae2054f965a7378c3408b0ccfad2bbd5) tdf#92623 MM: add unit test Adds the missing unit test to the bugfix. Actually the original bug was a crash, so this just does some test on the resulting MM document. Change-Id: I4c9f031e57157fe5744aa8290b7503b7e1990fc7 (cherry picked from commit 480e943f0100154fa82942db092ed1f66b76ef66) Reviewed-on: https://gerrit.libreoffice.org/21076 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit bdcafdff89836518cb94f362ca7ea4c09a82fa03) Reviewed-on: https://gerrit.libreoffice.org/21138 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit cce1320efa93cc42300e457b898d892ca580ddca)
2016-01-18tdf#96479 workaround bookmark end pos handling...Jan-Marek Glogowski2-4/+100
... when inserting text into a text node. Seems SwTextNode::InsertText doesn't handle bookmark end positions correctly. This is just handled correctly, if it also contains the bookmark start. This workaround simply concats the three strings to be inserted in advance, so we just have to call SwTextNode::InsertText once for the whole string. (cherry picked from commit c91024891ff10c2ae01e11a28a9aecca2f36b6c3) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx loplugin:stringconstant (cherry picked from commit 67d440e6bd2c895833fa22d0f9bf5dc6901723e8) loplugin:stringconstant (cherry picked from commit 6aa4496c789fec271dcdc7995cf62ef2dabf1f96) Reviewed-on: https://gerrit.libreoffice.org/21077 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e781a8273eb2938f905485c00fbaf432e517d1dc) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx 588a9c0205e03f701b617fd1775e7f9b9b88c6b0 60ee2ccc6090c305ade4ba16d3d298866cf89c4e Reviewed-on: https://gerrit.libreoffice.org/21137 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 107664a977c4893a0bc02f10cd20411c330b6d94) Change-Id: Iab7708b4cc4df406bdbc3a685c7410e0e797fdc4
2016-01-15Bump version to 5.0-18cp-5.0-18Andras Timar1-1/+1
Change-Id: Ie74ded5f7d891ad7bf20180b61537d7f161b0111
2016-01-15Expose metadata to deploy LibreOffice artifacts on Maven CentralDavid Ostrovsky6-0/+264
As outlined in the requirements to deploy the artifacts on Maven Central, the metdata must be provided: * Project Name, Description and URL * License Information * Developer Information * SCM Information [1] http://central.sonatype.org/pages/requirements.html Change-Id: I0bcd19a22d0e1a48f0faec0b414f816f7da5b318 Reviewed-on: https://gerrit.libreoffice.org/20315 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 9ca2de8c5995657973665189903aa2eebe0ef69a) Reviewed-on: https://gerrit.libreoffice.org/20813 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 708eab71f4d099a3887d32e59ef817db50324698)
2016-01-15Bump copyright year to 2016Adolfo Jayme Barrientos15-96/+96
(cherry picked from commit 8085555f6de5905028fdc0761c9e5b2fd4a3609a) Change-Id: Ifbd88aa55d5aa32a7b8dc11d7ac0310d0ef1e5d1 (cherry picked from commit 2a8f10162deb89aebc7ed625b4072ed6af818a88)