summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-05Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6Petr Mladek
Conflicts: desktop/source/app/sofficemain.cxx instsetoo_native/util/openoffice.lst solenv/inc/minor.mk Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
2012-11-05bnc#785727: Add more safety checks, exact bug mechanism unclearTor Lillqvist
Change-Id: Ieef2ce470613f6adfbb134d2bd59f2a6fd4a848d
2012-10-31add some new ado constants bnc#787452Noel Power
Change-Id: I1079cf87d223fc03e8cef53f69fa76ea4386c9b8
2012-10-31n#785767 import NS_ooxml::LN_CT_TrPrBase_gridBeforeMiklos Vajna
Change-Id: Id7f1471b49af52e6f6b0515ccd1fe8e12c50d9b5
2012-10-31n#785767 import NS_ooxml::LN_CT_TrPrBase_gridAfterMiklos Vajna
Change-Id: I4cb64ae2b2f2dbf643e38c5208eb759f265acafd
2012-10-30fix character positions translation (partial fix for n#757387)Radek Doulik
Change-Id: I042d6de9533f0f33e1fb64c3b92dc1bafaa6149f
2012-10-30vba procedures and macro names will result in crash, fdo#55174Markus Mohrhard
Change-Id: I23073ecc56482670d185b39452a7d8b9d6eb38c8
2012-10-30hopefully more successful attempt to solve fdo#50304Noel Power
Change-Id: I86dfff571c14bce97d0851b4093dbc376d8b6ea4
2012-10-30n#780645 docx import: properly import table positionPierre-Eric Pelloux-Prayer
This a follow up of commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc Reviewed-on: https://gerrit.libreoffice.org/714 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> (cherry picked from commit 3cb619bd15a6017f253891f4c377fc790d8aae82) Change-Id: Ia0f79ca24418636af14162e9f339237d847dc221
2012-10-30n#780645 docx export: export default table cell margins, based on 1st cellPierre-Eric Pelloux-Prayer
Reviewed-on: https://gerrit.libreoffice.org/716 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz> (cherry picked from commit 9751056ba806ba9614392f3c70ada3cbd1251814) Change-Id: I1a697c2a60c7979774242fb6c9b0f66baa3bb72e
2012-10-29rhbz#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-29n#773048: Adjust rotate in relation to fix for n#783433Muthu Subramanian
2012-10-29fdo#55931 Fix renderding of subscript/superscript with Autofit Text.Jan Holesovsky
We are using font metrics to compute the stretch ratio for autofit; but that collides with nPropr property of SvxFont - it is then counted twice, ie. in the case of nPropr == 25, we actually behave as if it was much less; and worse, only in the horizontal direction. Change-Id: Idba62f1e3f40802651b93f1344e376048866b1b6
2012-10-29Revert "n#778140 fix import of w:fldSimple character properties"Miklos Vajna
This reverts commit 29982fd31b163730ad54c414bf772e021af31e9b. It turns out that this hack is not really needed for n#778140, but it causes problems, for example in case of n#775899.
2012-10-29DOCX: w:doNotUseHTMLParagraphAutoSpacing should affect AddParaTableSpacingMiklos Vajna
commit 5d4bd2f97128adecc5b11699e98c934be3c3a462 unconditionally enabled AddParaTableSpacing doc setting, which broke the layout of some documents, e.g. n#778836. Fix this by doing what the WW8 importer does: enable the setting only in case the w:doNotUseHTMLParagraphAutoSpacing tag is present. (cherry picked from commit 68338abfd657ad5511a8a77b431ace8ad465c35e) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: I104259a1f37f28e3c4362eb638a134b593fcb851
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-16Bump versin number to 3.6 in EULAAndras Timar
Change-Id: I48f1086a81d7ef9d67f9b0dce585242902309f31
2012-10-15fix text rotation for txXfrm element, fixes n#783433suse-3.6-0distro/suse/suse-3-6Radek Doulik
Change-Id: I82a14170ce8d58184b1a86f7fc0f9e9d93238c92
2012-10-15avoid writing empty p:childTnLst elements, fixes rest of fdo#41992Radek Doulik
Change-Id: Idc09103bb8e4dbd580b5ae53f7929b4700f2c818
2012-10-15better pptx custom shape presets import/exportRadek Doulik
- sometimes we produced unreadable pptx document with custom shape presets - fixes part of n#760997 - before we rely on simple rule that adjustments were named adj1, adj2, ... in case of multiple adjustments and named adj in case there was only one. there are few exceptions though, so now we use exact adjustment names defined in presetShapeDefinitions.xml - TODO: there still might be problem when exporting custom shapes, which didn't originated in pptx import Change-Id: Ic9517a69145a295ba6f680ddc3cc30fc771db3fd
2012-10-15fill whole polypolygon at once, so that fill rule is applied correctlyRadek Doulik
- fixes rest of n#759172 Change-Id: I6c2694bf8276337b7d1fa54a12867bfc2b658a23
2012-10-15make fontwork custom shapes as one path object created from polypolygonRadek Doulik
- which contains outlines of all characters instead of creating group of path objects - now the stretched bitmap fill works correctly - stretching over whole text instead of only 1st character - fixes part of n#759172 Change-Id: I65211e336aadb8909b5d4a3dcb3647f44be22595
2012-10-15make sure we don't export shapes with negative size (fixes n#760997)Radek Doulik
Change-Id: Id77cbfaa287d15c4af9a91976f3b091e68229223
2012-10-15odf: export old path without unsupported commands in draw namespace as wellRadek Doulik
- to preserve at least some data for older versions of Libre Office Change-Id: I2a33706c2a2344e45b57a00469a7387072f8602b
2012-10-15odf: export arcangleto commands in enhanced path (use drawooo namespace)Radek Doulik
Change-Id: I43a2c08ee8dfc0abe4d05579b837b5be0944c0fe
2012-10-15bnc#741480: adjusted display of Bracket/BracePair in pptFelix Zhang
Change-Id: Ia4bbce74e2c1a5f46e0b1a73940aeb2ce8fc6ab9
2012-10-15write only non NaN chart series values (fixes part of n#760997Radek Doulik
Change-Id: I7c5bc8b9375a325d4ea78f033f577eff44cfd6e9
2012-10-15use master's shape position/size for layout shapes when needed (n#760997)Radek Doulik
Change-Id: I2a9d4f6b134817bda84645df3ab6fa217186e1d2
2012-10-15bnc#759197: adjust chart layout distanceFelix Zhang
Change-Id: Ifae4faeb234630dcce79851a0ad8bb0c6960f9f7
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-13it seems we still need the ::rtl:: prefix for OUString at some placesAndras Timar
Change-Id: I0c043e2c33ee51d73cf8e00a1032e5953e8c1639
2012-10-13confusion around parantheses near fabs()Andras Timar
Change-Id: Ifcab9f9ef73eb044288ed68014dc05acd9a2efa8
2012-10-13we love you 32bit sal_Int32 as longCaolán McNamara
Change-Id: I006bceae3d05d2c014beae2127ad8a57c9bee353
2012-10-13[mono] Make cli_ure build on windows againFridrich Strba
Change-Id: I4b79502121f9cb1577214a2c22ffa20bb599e419
2012-10-13[mono] mono-component-support.diff: add mono supportPetr Mladek
2012-10-13[mono] mono-climaker.diff: add mono supportPetr Mladek
merged with buildfix-climaker-disabled.diff: add mono support merged with climaker-csharp-win.diff: add mono support merged with buildfix-use-climaker-in-unoil.diff: add mono support Conflicts: unoil/climaker/makefile.mk Change-Id: I4c0ec75954df7a34ed6f4173f84190ab10e62c4b
2012-10-13[mono] mono-build-keyfile.diff: add mono supportPetr Mladek
2012-10-13[mono] build-mono-link.diff: add mono supportPetr Mladek
2012-10-13[mono] mono-build.diff: add mono supportPetr Mladek
integrated with cli_ure-prj-build-lst.diff
2012-10-13[mono] cli_ure-mono-bridge.diff: add mono supportPetr Mladek
merged with mono-bridge-version.diff: add mono support
2012-10-13[mono] cli_ure-source-bootstrap-makefile-mk.diff: add mono supportPetr Mladek
merged with mono-bootstrap-config-and-policy.diff: add mono support