summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-02-27Version 4.0.1.2, tag libreoffice-4.0.1.2libreoffice-4.0.1.2Petr Mladek3-0/+0
Change-Id: I3da279eeee5ab6d9dbfd114df73dff0ce119614c
2013-02-27bump product version to 4.0.1.2, release number to 2Petr Mladek2-25/+25
Change-Id: Id502e556db87caf2c1d2c06293e429a661f56147
2013-02-27remove the copied cond format cell attr entries, fdo#60306Markus Mohrhard1-0/+11
The old exisiting conditional format entries in the ScAttrArray will not be overwritten in 4.0 so that we might have gotten a wrong conditional format before our existing conditional format. Change-Id: Ib619f6a1b335e9bbdffc8b518fe41b729775d24c Reviewed-on: https://gerrit.libreoffice.org/2435 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-on: https://gerrit.libreoffice.org/2439 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-02-27one more fix for error bar import, fdo#60083Markus Mohrhard1-5/+17
This makes it finally possible to import the original test document. Change-Id: I5941f2ce303a28674dcf04aeabbbbc2d178c0913 Reviewed-on: https://gerrit.libreoffice.org/2434 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-on: https://gerrit.libreoffice.org/2438 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-02-27get error bar import working again, fdo#60083Markus Mohrhard1-53/+88
Change-Id: I8022fbfc8d372c9863d236253a2a63364198bfc8 Reviewed-on: https://gerrit.libreoffice.org/2415 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/2422 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-27use URM_COPY when copying cond formats, fdo#60306, fdo#60311Markus Mohrhard3-7/+7
Change-Id: I7a232c27dd0c1eee6f389d30f46658500aaded47 Reviewed-on: https://gerrit.libreoffice.org/2414 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/2416 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-26delay importing all drawing elements until content is loaded, fdo#60488Markus Mohrhard3-2/+27
Otherwise charts with data ranges on other sheets will not be painted correctly as the data is missing when the chart is rendered for the first time. This was not a problem before the cached value import because the hard recalc would have forced a repaint anyway. The new way should also be a bit quicker. Change-Id: Ieeee6a010a4dffad6ebe2264b8312f93b16d9c87 Reviewed-on: https://gerrit.libreoffice.org/2412 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/2418 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-26Paren fix for Ubu 10.04 build (and fdo#58417 ?)LeMoyne Castle1-7/+7
The form: OuterCtor( InnerCtor(array[i]).method() ) with explicit ctor(s), unused optional arg on ctor+method --> error 'parameter can not have variably modified type' gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5.1). Min fix: force precedence/associativity in type resolution. fdo#58417 BTs inside 1 of these ctor calls. Change-Id: I4d8b979df0fc827758b1e9a336031671425486ea Reviewed-on: https://gerrit.libreoffice.org/1531 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi> Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Lubos Lunak <llunak@suse.com>
2013-02-26Fix i#119756 Safer take care of empty paragraphs in EditEngine layoutingArmin Le Grand1-29/+35
This fixes fdo#59629 on our side. Conflicts: editeng/source/editeng/impedit3.cxx and moved sal_uInt16 nIndex back up in scope. (cherry picked from commit b57cb5326713da9e926bb2ad5a56dce90ac00a87) Change-Id: Ie2b5dac48b10ff8c031f481f0a7ddde644694975 Signed-off-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-on: https://gerrit.libreoffice.org/2405 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-26fdo#45879 - fix selected gluepoint rendering.Michael Meeks1-5/+5
Store the glue-point bitmap at a unique index in maRealMarkers for re-use. (cherry picked from commit 8d34984116c0841748ae47afa667877dc1b5a444) Change-Id: I2cd5b240619502dfc8634eca331f4163e5bd5ca8 Signed-off-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-on: https://gerrit.libreoffice.org/2424 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Jan Holesovsky <kendy@suse.cz> Tested-by: Jan Holesovsky <kendy@suse.cz>
2013-02-26respect local number format in cond format dlg, fdo#60574Markus Mohrhard1-19/+27
Change-Id: Iec185ac6c6447176731619249cdda4457f1bb8a3 Reviewed-on: https://gerrit.libreoffice.org/2411 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/2420 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Jan Holesovsky <kendy@suse.cz> Tested-by: Jan Holesovsky <kendy@suse.cz>
2013-02-26ocMacro and ocExternal need to be recalculated on load, fdo#60977Markus Mohrhard1-3/+3
Change-Id: I9e69ca2feae44bc645e8a49e349557f0933a23eb Reviewed-on: https://gerrit.libreoffice.org/2413 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/2417 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Jan Holesovsky <kendy@suse.cz> Tested-by: Jan Holesovsky <kendy@suse.cz>
2013-02-26automatically extending cond formats is dangerous, fdo#60828Markus Mohrhard1-2/+3
Change-Id: I45549e163f21550e879a171d80e836b6df3dd2cc Reviewed-on: https://gerrit.libreoffice.org/2410 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/2421 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-26use >= as mentioned in the UI, fdo#60798Markus Mohrhard1-2/+2
Change-Id: Iac6737e98eb0961de22036f42634ebad7d42dfcc Reviewed-on: https://gerrit.libreoffice.org/2409 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-on: https://gerrit.libreoffice.org/2419 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-26fdo#59405: initialize members of TransferableObjectDescriptorMichael Stahl1-0/+7
The mnViewAspect member is otherwise only initialized if a SOT_FORMATSTR_ID_OBJECTDESCRIPTOR thingy is in the clipboard, which only happens if the clipboard source is OOo/LO. When inserting an OLE object, the value MSOLE_CONTENT apparently results in requesting the current size from the OLE object, which looks much better than the square default. Change-Id: I8c7fb80a8ae88272f1ecaf3a375bef5d917f2a5b (cherry picked from commit 0cf6433117477642897fb2d874a4353eff8a1f35) Reviewed-on: https://gerrit.libreoffice.org/2393 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit a724fb43d8540687e33d75c90660250e5308585d) Reviewed-on: https://gerrit.libreoffice.org/2397 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-26n#780748: Basic EMF+ implementation.Muthu Subramanian2-1/+215
* Minimalistic implementation of EMF+ export * Currently exports transparent polygons. (cherry picked from commit f1fee2a65c8c1968798e1246a4b455d9160d8eb9) Change-Id: I0c24c29b77c50f898fe1b8ce1904179292a1bb72 Reviewed-on: https://gerrit.libreoffice.org/2395 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit 32bc874ded4f9108a32bd76a53ecc001e6ba2a83) Reviewed-on: https://gerrit.libreoffice.org/2399 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-02-26fdo#59405 fdo#60638: EMFWriter::ImplWrite: write EMF_PLUS "comments"Michael Stahl1-1/+14
When editing the Visio OLE object, there is a "preview" file generated, which is apparently an EMF file (strangely initially inserting the Visio object seems to result in a totally unproblematic WMF file). The EMF file apparently has almost its entire content stored in MetaCommentAction of type "EMF_PLUS", which is thrown away when writing the file again. Change-Id: I77a08454da673c1825aaa8421606737e7e8bc82c (cherry picked from commit bf8450cfa2e9e899c716fbddadd7d5485aefe520) Reviewed-on: https://gerrit.libreoffice.org/2396 Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> (cherry picked from commit 4536979e19d6a9a913f677225a122c13a51da1fa) Reviewed-on: https://gerrit.libreoffice.org/2400 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Tested-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Radek Doulík <rodo@novell.com> Tested-by: Radek Doulík <rodo@novell.com>
2013-02-26fdo#59405: cppcanvas: fix infinite loop in processEMFPlusMichael Stahl1-1/+10
This can be observed when inserting the bugdoc from fdo#59405. Apparently the "size" and "length" do not agree; ensure that the "length" does not underflow. Change-Id: Idfc68919859b8284c724831de21208e4392af328 (cherry picked from commit ec0d1440cf07008a220708535848567bcbb233ea) Reviewed-on: https://gerrit.libreoffice.org/2394 Reviewed-by: Radek Doulík <rodo@novell.com> Tested-by: Radek Doulík <rodo@novell.com> (cherry picked from commit 6cf68eab5eb77b7e081ef5f8d59d196411e86567) Reviewed-on: https://gerrit.libreoffice.org/2398 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Michael Meeks <michael.meeks@suse.com>
2013-02-26fdo#61428: SwTxtNode::ReplaceText: brown paperbag fixMichael Stahl1-2/+2
Fix the optimization to return only if both replacement and replaced strings are empty. (regression from b6d45f26ea5bcc848737921b59a16253eb1d8587) Change-Id: I984fb151a5ac3e6eb8d03f854ad6a3df88f96000 (cherry picked from commit 3e6a0b6d04722d43a1fc8d3745b5e79b7ced90eb) Reviewed-on: https://gerrit.libreoffice.org/2407 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 3f5361a9402cd6df4da7fb98108ae1906b41edd3) Reviewed-on: https://gerrit.libreoffice.org/2408 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-25fdo#59928: sw: fix mouse selection of fields differentlyMichael Stahl2-25/+29
Unfortunately selecting the field in SwEditWin::MouseButtonDown() prevents the click field handling code in SwEditWin::MouseButtonUp() from running. Instead select the field in MouseButtonUp and SwWrtShell::ClickToField(), which seems to work better. (regression from 94721b2aec614e0d99504138d484b2ad6cd550c7) Conflicts: sw/source/ui/wrtsh/wrtsh2.cxx Change-Id: I3d769487b9d5225ffd07b384fbb0ce01e0733be5 (cherry picked from commit a4a457100a3a6e9f59113e82c9d0b12786273671) Reviewed-on: https://gerrit.libreoffice.org/2286 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> (cherry picked from commit 7063ea7cc1eadb22ac3ca6c2d54001408b60ef95) Reviewed-on: https://gerrit.libreoffice.org/2291 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-25migrate even more configuration setting (fdo#57061)Petr Mladek1-1/+14
+ application windows size + I was afraid to migrate any /org.openoffice.Setup stuff because there seemed to be many hardcoded values; But the parts mentioned in registrymodifications.xcu should be configurable and thus safe to migrate + „Enable macro recording“ and „Enable experimental features“ options + sigh, we do not want to migrate /org.openoffice.Office.Common/Misc/FirstRun; thus we need to explicitely mention all the other items which is error prone + Tools/Options/LibreOffice/Paths/My documents + ah, the paths are handled on two locations: /org.openoffice.Office.Paths and /org.openoffice.Office.Common/Path + Macros + I was afraid to copy user/basic because there were some content out of box. I though that it might be version specific. In fact, the default content is just empty templates that look the same even in old releases => it should be secure to copy it after all Change-Id: Ie1c04e9df36f6b6961bbaaeb922e29d64128ade4 Signed-off-by: Petr Mladek <pmladek@suse.cz> Reviewed-on: https://gerrit.libreoffice.org/2340 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-02-25Corrected SVG gradient primitive and it's decomposition (i#120616)Armin Le Grand3-23/+69
Conflicts: drawinglayer/source/primitive2d/svggradientprimitive2d.cxx Change-Id: I04c148303e7153a5376eae79803c540f6eba0b00 Signed-off-by: Petr Mladek <pmladek@suse.cz> Reviewed-on: https://gerrit.libreoffice.org/2387 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-25fdo#55931, fdo#57956: Fix both autofit and stretched width.Jan Holesovsky1-1/+7
This rewrites commit fa694a21b806ed7837c1337ec49a4b299c478393 (fix of fdo#55931), and fixes it a better way. Change-Id: I9ac0c78294e6a9c510c12b22547564b736416131 Reviewed-on: https://gerrit.libreoffice.org/2389 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-25fdo#54087 build npsoplugin on Windows, it does not depend on GTK+ thereAndras Timar1-1/+1
Change-Id: I033ee2316337dab549f1beddbfb7919a35d73c8e Reviewed-on: https://gerrit.libreoffice.org/2381 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Petr Mladek <pmladek@suse.cz>
2013-02-25Fix scan for central directory end signature in ODF in Spotlight importerTor Lillqvist1-5/+22
Once this was fixed it seems to work nicely. Add keywords in File:Properties and they show up in Finder's Properties, and Spotlight finds text from the document contents. (cherry picked from commit b8da61acb2bb887a7335a5db82b8b5ae1e0fab69) (cherry picked from commit 95e6a0885e65cc57b11719cc0658be9d8b78fba9) Change-Id: I9adc65d1821d0920ce3a39d05697557c4303ff68 Reviewed-on: https://gerrit.libreoffice.org/2266 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-25fdo#61376 librelogo: fix missing Asian and CTL support, etc.László Németh2-45/+136
Change-Id: If2d15d7b299d0b05e9fd3171d51c1f0e947ef561 Reviewed-on: https://gerrit.libreoffice.org/2354 Reviewed-by: Andras Timar <atimar@suse.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-25Uploading libvisio-0.0.25 fixing fdo#60433Fridrich Štrba1-2/+2
Change-Id: I854fd87a21fc63a5c274b38831589b3d76379e25 (cherry picked from commit 392691c91fbfa96f1805f1cd556dc115b9a486e3) Reviewed-on: https://gerrit.libreoffice.org/2377 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> (cherry picked from commit 0f203c99fac3778500dbf664e34ac4cd2d6455de) Reviewed-on: https://gerrit.libreoffice.org/2378 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-25Allow specifying of page namesFridrich Štrba1-1/+4
Allow specifying of page names (cherry picked from commit bee8ed6772f420f9eefc57fee01da29ff466a8e9) We need to escape special characters in slide names (cherry picked from commit ea4581a914cb1aad29f16b73e35350f05f8adc1c) Change-Id: I5f523642b980469afa46e1895cfd39aa08b9941d Reviewed-on: https://gerrit.libreoffice.org/2333 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> (cherry picked from commit 4c0e53e6530c5590f7123f506a1a58bcbd04e13d) Reviewed-on: https://gerrit.libreoffice.org/2337 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-24Updated coreAndras Timar1-0/+0
Project: translations 5c4232fce18abab021c94bb603d1fe73e82d3945
2013-02-22Avoid infinite recursionTor Lillqvist1-1/+1
(cherry picked from commit 0d05957cf0c38abab45030ba172025e4ef318f43) Change-Id: I3085b82a80228211951b5230b7e8d3bcf535e052 Reviewed-on: https://gerrit.libreoffice.org/2269 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-20Don't cripple the icu dataFridrich Štrba1-1/+2
CorelDraw and MS Publisher importers use icu for conversions between 8-bit character sets and UTF8. In some cases even between UTF16 and UTF8. Thus we need the relevant data. Use the default icu-provided data for the while. Change-Id: I0f0f838cc3a0ce88b2d2a1bfd62b6c4ae98de9d3 Reviewed-on: https://gerrit.libreoffice.org/2296 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi> (cherry picked from commit aeaa4fb859e2422a4952bda022e7a40ccbd86b9f) Reviewed-on: https://gerrit.libreoffice.org/2297 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Bump android remote version to 1.0.3+, version code to 5Petr Mladek1-2/+2
Change-Id: Id6ce687c7925f6d9ebca446be16b5ae237ca97f8
2013-02-19bump product version to 4.0.1.1+, release number to 1Petr Mladek2-22/+22
Change-Id: I3e3ece8c4383af8eef23d1fd51bfd1b7575113df
2013-02-19Resolves: fdo#52519 crash on typing some MalayalamCaolán McNamara2-0/+12
(cherry picked from commit eea3634b2bd85e7f290e0504da1b8906c7d33ca4) Conflicts: icu/UnpackedTarball_icu.mk Change-Id: Ie31da5896d98908fd540146d1105ecc4257fa071 Reviewed-on: https://gerrit.libreoffice.org/2264 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Surely we want closesocket() on WindowsTor Lillqvist1-0/+4
(cherry picked from commit 49db90342f193f31500b2717cc27bdf2f25e2d95) Change-Id: I91461ae31c9934e6b3176402e2772ba7371f0fdb Reviewed-on: https://gerrit.libreoffice.org/2263 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Branch libreoffice-4-0-1Petr Mladek3-0/+0
This is 'libreoffice-4-0-1' - the stable branch for the 4.0.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I80a7ba7cc65ed9ffe97f3b98656291dabe172df1
2013-02-19fix dependencies of the obsolete stdlibs package on linuxPetr Mladek2-15/+34
The old version should get repalced by the ure package. It should also conflict with the new ure package. This commit adds support for %incompat epm tag. It produces conflicts in rpm and deb. It can be defined in setup_native/source/packinfo by linuxincompat. This commit also removes obsolete hack for debian dependencies. libreoffice-bundled conflict is mentioned in the desktop-integration package these day. The hack in epmfile.pm was not used because no package used "replace" tag. Change-Id: I5e9cb89a6108c22c61287fce1ffc6baf3f618d15 Reviewed-on: https://gerrit.libreoffice.org/2260 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-19bin also copying stdlibs into solverPetr Mladek1-3/+0
related to the removal of --without-system-stdlibs option Change-Id: I46291a2cd648505c47c6f4222aeb73bfbbd3fdc4 Reviewed-on: https://gerrit.libreoffice.org/2259 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-19Fix crashes in sdremote after suspend/resume cycles.Thorsten Behrens2-4/+5
Change-Id: I0f64820887919386f266290ae8b7c53f8a0a5458 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-02-19sdremote: fix linux conditional.Michael Meeks1-1/+1
Change-Id: I911863f07b08e771d78a4a98d9a4f82c93a7d55e (cherry picked from commit da8cf16796b916552e4aa0ab294359f91a9b8c0e) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19sdremote: listening to dynamic changes to adapters.Michael Meeks7-34/+124
Allows LibreOffice to start with no bluetooth, and for it to appear and disappear dynamically at run-time, cleaning up stale bluetooth sockets, and re-binding successfully each time. Change-Id: Ifa04c8cc1859c98adca94ac0e57c7ebd85f2f31f (cherry picked from commit 93abe8688a4700c04b5ab045eb296298e1b49031) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19sdremote: re-work discoverable property get/set to use libdbus.Michael Meeks2-198/+248
Change-Id: I5e11a0fcfd8db648a40c738cbc8181889cb36136 (cherry picked from commit 618fe83d6e8aeabc309540fae998aeb78465bb4d) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19sdremote: switch to a non-blocking socket, and polling glib mainloop.Michael Meeks2-20/+77
Conflicts: sd/source/ui/remotecontrol/BluetoothServer.cxx Change-Id: I84c0a522fe16fbc8fc86a8e4bccb84aec0a1acd1 (cherry picked from commit 0d89d814055d5c267a2cc57e302a23e9f0b521e3) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19sdremote: re-write SDP registration to use raw dbus-1 not dbus-glib.Michael Meeks1-84/+161
Conflicts: sd/source/ui/remotecontrol/BluetoothServer.cxx Change-Id: I65ff5e603b6719df69b3c2aef7ff438ad54d23e2 (cherry picked from commit 5a90716b802d281c111e1f4f43f3fefded2c1f81) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19improve bluetooth discoverability toggling API.Michael Meeks6-40/+52
Change-Id: I289d43fcb173b64b01183a41f780bc74d2ba0abe (cherry picked from commit 21979643e47e503a20113b1e8e98814717c71ac5) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2013-02-19No need of gcc3_specific eitherFridrich Štrba2-44/+0
Change-Id: Ia71e77dbde3d4fe791ca9cdd093951e708e53f32 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-02-19No need to copy the gcc libraries anymoreFridrich Štrba3-80/+0
Change-Id: I6dbf44bb78f14ab71a48a9cd4e9ebba60bfc97d2 (cherry picked from commit 8ff09509d725ce18814d5d77794f227d0c72037b) Reviewed-on: https://gerrit.libreoffice.org/2254 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-02-19fdo#60719 : fix crash on scaling bmp with target/source width/height = 1Norbert Thiebaud1-23/+71
The rendering is quite ugly compared to the same pdf opened with pdf reader. but at least it does not crash anymore. The function ImplCreateRotatedScaled seems quite sub-optimal for one thing it is called even when there is no rotation and still bother with doing a lot of work to 'rotate' things. It was assuming Width and Height > 1 for both the source and the target The patch tries to 'hide' the misery... but I'm not convinced that this is 'right'. Change-Id: I9aec5eb6655ea3678aa018ae5928dabb8058bec6 Reviewed-on: https://gerrit.libreoffice.org/2195 Reviewed-by: Arnaud Versini <arnaud.versini@gmail.com> Tested-by: Arnaud Versini <arnaud.versini@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/2248 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-19Make sure MetadataImporterPluginFactory has external linkageTor Lillqvist1-0/+1
Otherwise, in a LO built with hidden visibility (as gcc terminology, not ELF, Mac OS X does not use ELF), Spotlight won't be able to use our importer. (cherry picked from commit 7c6b42851bc0a94f6aa8c3e28892d1ab4b297c25) Change-Id: Ie19082f9f14e4cc75ae6f7583031b929b7b75330 Reviewed-on: https://gerrit.libreoffice.org/2247 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2013-02-19Kill the --without-system-stdlibs optionFridrich Štrba9-78/+4
(cherry picked from commit 3708fe8434ad6f64d527215f4619556b0a5701ff) Conflicts: external/Module_external.mk scp2/Module_scp2.mk Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f Reviewed-on: https://gerrit.libreoffice.org/2252 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 13:23:53 +0000