summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-27fdo#53474: Fix Windows Java Accessibility Bridgelibreoffice-3-6-3Stephan Bergmann
...by folding the contents of java_accessibility.jar back into java_uno_accessbridge.jar. In the old build system there were two jars, java_uno_accessbridge.jar containing the handful of org.openoffice.accessibility classes and all org.openoffice.java.accessibility classes (though how the latter got included was fairly obscure in the makefile.mk) and unused java_accessibility.jar that contained all org.openoffice.java.accessibility classes. When adapting this to gbuild, the unused java_accessibility.jar was carried over, but all its org.openoffice.accessibility classes were inadvertently droped from java_uno_accessbridge.jar. (cherry picked from commit 5ba1694606577f9cda2b773d82ae765118bfc9e1) Conflicts: Repository.mk accessibility/Jar_accessibility.mk accessibility/Jar_uno_accessbridge.mk Change-Id: I9b582ba22667b1dae635828e85c4cc5b530353ac Reviewed-on: https://gerrit.libreoffice.org/907 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-10-23Resolves: rhbz#868479 / fdo#56281 doubled ~ in German ok/cancel translationsCaolán McNamara
We have unix-specific code adding ~ to OK/Cancel. So don't add ~ if string already contains those. Though its an open question if the presence of ~ is a bad thing for the Windows case. i.e. if we should have tooling to not allow the OK/Cancel translations to contain ~ in the first place, of if we should drop the ifdef UNX and do it globally now Change-Id: I461c6ac9ca574ed188f51472919be82ec582e389 Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Eike Rathke <erack@redhat.com> Signed-off-by: Andras Timar <timar74@gmail.com>
2012-10-23fdo#55800: fix hex color conversionIvan Timofeev
Reviewed-on: https://gerrit.libreoffice.org/895 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 66446668dad9dfb8394fe3e6afcff78662efc63a) Change-Id: I4e60837b3cc557e1df3d7e1312ed083f2b267dde Reviewed-on: https://gerrit.libreoffice.org/897 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2012-10-22export symbols after gbuildificationDavid Tardon
Change-Id: I5c8ef1009a65fa5a38174898f58f9146e1367aa9 Signed-off-by: Michael Meeks <michael.meeks@suse.com> Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-10-22only use non blank cells in the visible data methods, fdo#54552Markus Mohrhard
(cherry picked from commit 40377a6e26aa61a1c0788cad1c97a10911d38da8) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 23e6bac62ef6482c287bb0f55c662ac2047ebb33) Change-Id: I2a0914fbaff3e3f707a9c06f693079aed2b89ba4 Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Eike Rathke <erack@redhat.com>
2012-10-22Fix fdo#47669: also check if we started the tag before ending itKorrawit Pruegsanusak
The problem is we created imbalance end tag </w:hyperlink> which shouldn't be there. So, place a check before inserting end tag should help. Inspired by (read: copied from) c1c2688912e769dfd7654e11e87dae380a8ce1eb ;) (cherry picked from commit 3b042335208cb2c995f4860bf8ba3bd1e2f2e859) Change-Id: Ic933f6da44c788cba48bb2fe6fa29658985310b6 Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-22write the custom sort list info into the item set, fdo#53870Markus Mohrhard
(cherry picked from commit 4302eb0a6c4e28ab675de9d59e73cac345ba30c7) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 07cc274256ebff259e228e7285bc27e6ddc94fdc) Change-Id: I9c7f62b47f83b7798a8efdbf3896503918929f03 Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Eike Rathke <erack@redhat.com>
2012-10-22ignore broadcaster cells to fill autofilter dialog, fdo#55712Markus Mohrhard
(cherry picked from commit 622f7751b78fd8584e34f5fa96a04ed6e8bb98f5) Signed-off-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 637096b75f2989640967e72aee41e48b07a5a602) Change-Id: Iacd3f8cfc26bb147eaf3b6957338be212b448226 Signed-off-by: Petr Mladek <pmladek@suse.cz> Signed-off-by: Eike Rathke <erack@redhat.com>
2012-10-19exchange sort settings between the two tab pages, fdo#53482Noel Power
Change-Id: I540481585bec2479db541025755c2a5a670da9ed Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com> Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-10-16don't insert notes from deleted cells, fdo#55885Markus Mohrhard
Change-Id: I036f0531dc2290c5eb480258bc70ec13b810e6bc Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com> Signed-off-by: Eike Rathke <erack@redhat.com> Signed-off-by: Noel Power <nopower@novell.com>
2012-10-15Check for null object. The OLE name may not always be set.Kohei Yoshida
(cherry picked from commit fb1d9cc99e026ba9cf15ab49b2251cecfbbf6d10) Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit ea50fe437b4f61e6c97d81721441da2b7d1e2f66) Change-Id: Ib3e55af8870b41a5b76179d2215fc5125ceda5af Signed-off-by: Michael Meeks <michael.meeks@suse.com> Signed-off-by: Eike Rathke <erack@redhat.com>
2012-10-11only access first element if vector is not empty, fdo#55734Markus Mohrhard
Change-Id: I60db486195e7216968dc8c7c7c0c79fb7e8c1b88 Signed-off-by: Noel Power <nopower@suse.com> Signed-off-by: Eike Rathke <erack@redhat.com> Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-10-11kill this hard coded sheet limit for xlsx import, rhbz#864858Markus Mohrhard
(cherry picked from commit 458d68fffa883bc706638299e5a5b2d1399beb0d) Signed-off-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 0eee6469304ba15f42bcafb6707cc98bcbff9112) Change-Id: I49e12d97d1e17b0a63daf374e7ff4b4720129553 Reviewed-on: https://gerrit.libreoffice.org/857 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com> Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-10-11fix for fdo#53814 Revert "there should be no need any more for this check"Noel Power
This reverts commit bea018a7040c36e91487b27c7b59c6c8a970bf5f. Change-Id: Id554a8f05b82f146a505ac0a39afe14a3161291c (cherry picked from commit cd9d51a36cc3106d4124855874af657615a93061) Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com> Signed-off-by: Jan Holesovsky <kendy@suse.cz> Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2012-10-10bump product version to 3.6.3.1+, release number to 1Fridrich Štrba
Change-Id: Ie46423f68c2404ff3237ef0979c72413ab72bdfe
2012-10-10Branch libreoffice-3-6-3Fridrich Štrba
This is 'libreoffice-3-6-3' - the stable branch for the 3.6.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.6.x release, please use the 'libreoffice-3-6' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I4976818f4d99fb34e4300ebc87e0856a6727e785
2012-10-10fdo#55526: fix import of RTF \brdrhair:Michael Stahl
This is a hairline border that should be mapped to a non-zero width border given that LO doesn't have hairline borders as such. Change-Id: I4a2d2f983ac8e016b2ddb6b38435f5562e545c72 (cherry picked from commit 59ab112fe93cbf4e2b052f4e8bafbdb4e6738bef) Reviewed-on: https://gerrit.libreoffice.org/847 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-10Fix fdo#55142 - use proper output offsets.Sergey Farbotka
Change-Id: I49cd72a91cd31ddc8b3d57000210523a73926d1f Reviewed-on: https://gerrit.libreoffice.org/853 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-10add editeng::ConvertBorderWidthFromWord:Michael Stahl
Replace the 2 duplicate implementations of this in ww8 and writerfilter with a common one. Differences were: 2) ww8 doubles the with, writerfilter does not 13) unsupported, mapped to THINTHICK_SMALLGAP vs. THICKTHIN_SMALLGAP 22) unsupported, mapped to DASHED vs. SOLID 26) INSET not supported in writerfilter 27) OUTSET not supported in writerfilter Change-Id: I533b77394388e736f38d70284a6a11061d81e813 (cherry picked from commit ecd70a727d7f559ebda1dd726cea1be472948270) Reviewed-on: https://gerrit.libreoffice.org/846 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-10RepositoryExternal: internal libpng requires zlib as wellMichael Stahl
(cherry picked from commit 398ce44c54b26b31eb826c150926fd49e59b4f52 and commit f96d58bd53d8068f6056b3f9e45a2b14be5dd4a9 by Matúš Kukan <matus.kukan@gmail.com>) Change-Id: Ib23b2a6bd9301a03321ddb5c8a488b579fa8d1a2 Reviewed-on: https://gerrit.libreoffice.org/848 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-10fdo#54648: WW8 export: test that FlyFrm actually has layout frmMichael Stahl
The bugdoc has 2 "hidden" drawing objects that are invisible. Change-Id: I58179f2e620348db5357b38f834e1edca1f20ae2 (cherry picked from commit c1d2eed375293d7c27bb885f344cc24ec0cd40ca) Reviewed-on: https://gerrit.libreoffice.org/845 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-09don't insert the same pointer twice into a ptr_set, fdo#55710Markus Mohrhard
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-10-09xlsx fix import/export of column widths fdo#55623Noel Power
column widths were never imported or exported correctly in xlsx. Change-Id: I92d469ce52495fe77281cb22341e9c5127e6b506 (cherry picked from commit 8e753f8446554822d97969b0c18eba6cb9d79e26) Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2012-10-07fdo#46071: Do not hide windows based on nil "Visible" propertyStephan Bergmann
This appears to be messy: The /org.openoffice.Office.Views/WindowType configuration group template has both a nilable bool "Visible" property and a UserData/Data string property that encodes various things like geometry---but also visibility---in a string. Now, likely due to the problem that has meanwhile been fixed through f3f79cc9e6c265baf48955d53f7e888205e0b3e0 "Resolves fdo#46074: Fix Partial::contains for paths that go past a leaf node," some registrymodification.xcu files in the wild contain such WindowType entries in "default" state, without a UserData/Data string and with a nil "Visible" property. The way SfxChildWindow::InitializeChildWinFactory_Impl and SvtViewOptions::IsVisible are implemented, they will always lead to an invisible window for such broken registrymodification.xcu data (as IsVisible unhelpfully returns false for a nil value, and InitializeChildWinFactory_Impl uses that value when there is no UserData/Data string). For the Math formula editor window (ID 30378) this means that it can disappear from the UI completely, as there appears to be no UI trigger for the user to show it in case it is hidden. The fix is to introdue SvtViewOptions::HasVisible (which only returns true if the property is not nil) and change InitializeChidlWinFactory_Impl to only use the value of IsVisible() if HasVisible() returns true. This makes the code even more baroque, but this is a rather central, generic piece of code for all sorts of windows, so I do not want to break any other uses by e.g. changing IsVisible to return true for a nil property. Change-Id: Iae40075a7116a8aabd2d25aa9334709522e23d8f (cherry picked from commit 9db74c6133ede2a28af077fd563398176ff0d858) Reviewed-on: https://gerrit.libreoffice.org/773 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-07rhbz#820283, fdo#55462: sw: better fix for DOCX table import crash:Michael Stahl
The fix in 6d2e09db4a677068095b0bebd08fbbb96620d60c is completely bogus. Only vertically merged boxes result in dummy boxes with negative span, while horizontally merged boxes result in different numbers of boxes per line. So instead of inserting boxes, adjust the width of the last box in rows that are missing boxes, such that all lines have the same width. (cherry picked from commit 4113d9664c60d004474dfc1cffbcd7dc50fa6dc4) Conflicts: sw/source/core/docnode/ndtbl.cxx Change-Id: I4e90e852b314bf6f7885bde7b450dab7c668469e Reviewed-on: https://gerrit.libreoffice.org/764 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-06limit polynomial degree in the dialog, related fdo#46100Markus Mohrhard
Change-Id: If49db1a503548103dcf605cc1c2d8064cdd2d5b2 Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-10-06limit degree for b-spline to 15 to prevent std::bad_alloc, fdo#46100Markus Mohrhard
Change-Id: Ib801c6af84b52ed093be2ba5eba902513bfa4070 Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-10-05New release libcdr 0.0.9, fixes fdo#55522 and partly fdo#54785Fridrich Štrba
Change-Id: I85516bcb97cc066fb25bb74ef253ff6ae6942d10 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-10-05workaround broken uno implementatiion with ScRangeListMarkus Mohrhard
Change-Id: Ied665e59ada98c25651be562c4a2fe54ffd1ec6a Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2012-10-05fdo#52022: Simple/LargeControlPoints actually can have nil valuesStephan Bergmann
...in old LO 3.5 registrymodifications.xcu, which causes trouble when migrating to >= LO 3.6, see <https://bugs.freedesktop.org/show_bug.cgi?id=52022#c23> for all the details. Change-Id: I8fa1e67998c9588b9d8bf3a3b52e4b0684d3d705 (cherry picked from commit a51833bf79eed21a7cddd6da45dc9d3dc07b4983) Reviewed-on: https://gerrit.libreoffice.org/765 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-04really export default row heights for xlsx fdo#55621Noel Power
Change-Id: Icdf581cd7ae245f2749fecf00957bc9524f717d8 (cherry picked from commit 5a651522acb42fcffa6defc212cb8d0e9b9b7d3f) Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2012-10-04fdo#54940 - make editing relative refs more intuitive to meMichael Meeks
Change-Id: Id3aa76010d92e71c5dc417fdafba90c3ea8401c8 Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-10-04Revert "really export default row heights for xlsx fdo#55621" wrong branchNoel Power
This reverts commit 6b686a18539b384d032358879bd06d2def280842.
2012-10-04Revert "xlsx fix import/export of column widths fdo#55623" wrong branchNoel Power
This reverts commit f08e1ac6c0998e36359cc08e590ee6e8dfab3599.
2012-10-04xlsx fix import/export of column widths fdo#55623Noel Power
column widths were never imported or exported correctly in xlsx. Change-Id: I92d469ce52495fe77281cb22341e9c5127e6b506
2012-10-04really export default row heights for xlsx fdo#55621Noel Power
Change-Id: I81173507b30fc260043e6c57c123926a17424797
2012-10-04fix for fdo#55565 regression, failure to export vertical text in shapeNoel Power
Change-Id: If3d6413b1fb9e02dc26f930634f84712d7d08ca3 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-10-04fdo#44278: fix leaked image when import docxCédric Bosdonnat
Unused temporary XShape need to be disposed to avoid remaining garbage in the document. Change-Id: Iaf6e720a1c47605136f7f9ccafb605cab6dc260a (cherry picked from commit f1fc7c5655dde547b721b3afffabcd8bdbe0add2) Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
2012-10-03splash screen: fix RTL modeIvan Timofeev
Change-Id: I6a00cba8fda11351ed5340f21678c330ce028a2d Signed-off-by: Jan Holesovsky <kendy@suse.cz>
2012-10-03correct help string: horizontal -> verticalIvan Timofeev
Change-Id: Id67da9d90a8fa21b99733c448fc32e81c6f1ab46 Signed-off-by: Jan Holesovsky <kendy@suse.cz>
2012-10-03Help text for newly introduced switches.Jan Holesovsky
Change-Id: I3f148d0dd61adc7008fdf64d077818c22a0e7d09 Signed-off-by: Ivan Timofeev <timofeev.i.s@gmail.com>
2012-10-03misc comment import/export fixesNoel Power
Cherry pick the rest of the commit ... a) fix vmldrawing.vml for xlsx export ( changed from frame to textbox, added support for shadow element with attributes, shadow color, shadow obscured ) b) use proper fillcolor attribute c) detect whether note/comment is shown on import d) export state of note ( shown/hidden ) text position still not perfect, we still are missing some attributes to control that. Change-Id: I59b446175217479ce7960287aa540df8c6b2b1ea Conflicts: oox/source/export/vmlexport.cxx sc/source/filter/xcl97/xcl97rec.cxx
2012-10-02fdo#46278 - misc comment import/export fixesNoel Power
detect whether note/comment is shown on import export state of note ( shown/hidden ) parts of Change-Id: I59b446175217479ce7960287aa540df8c6b2b1e Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-10-02fdo#52268: splash: change color and position of messagesIvan Timofeev
Change-Id: If6c607fc9f0be1f7a71eda8d555399451938c5fc Signed-off-by: Jan Holesovsky <kendy@suse.cz>
2012-10-02Resolves: fdo#54862 extra ++n causing merged cells to be skippedCaolán McNamara
commit 567c1db25bd705faac44203e4a3d01d0f5e1385c reverted a pile of other commits, including 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f but didn't revert the ++n of that commit, leading to merge groups getting skipped Change-Id: Ie2b46ebc433df636ebe0092f4a992631b7f06a3f (cherry picked from commit b966a09c2da9441961c93c44be556399575db849) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-10-02Add back compatible Hungarian date format acceptanceLászló Németh
Change-Id: I6b6d62cda241250db89cdcabaa04952d36e1acfd Reviewed-on: https://gerrit.libreoffice.org/720 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com> Signed-off-by: Andras Timar <atimar@suse.com>
2012-10-02fdo#53673 fix for layout problems with version 3.6 and upWinfried Donkers
Change-Id: I626ec5bce931005dccbc8f4d235e8208ae98f9a5
2012-10-01n#707779: Fix overflowing of left margin value in editeng when negative.Jan Holesovsky
Change-Id: I9d39a9cfacf07aa596d047aee66c71b5ac6008ec (cherry picked from commit d953cc27fc5da5e612b1dc4c29707c09d17fc643) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2012-10-01auto-expand the first conditional format in the list.Michael Meeks
Change-Id: I65280d39b560b4b7eed3e21a6e6c7b02c124f10a Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2012-10-01improve conditional formatting height calculations.Michael Meeks
Change-Id: If5080892b820d268ffef22111d0caee217586b56 Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>