summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-11-06[mono] fix build in gbuildised unoilPetr Mladek3-0/+35
Change-Id: I9c717b067e067338160a38c88d935187db8cc04d
2012-11-05Correctly handle cell note shifting when immediate row/column is deleted.Kohei Yoshida1-4/+12
Currently, having a note e.g. at D5, and deleting cell D4 and shifting the cells below upward will remove the note at D5. But the correct behavior is to shift that note up to D4. This change fixes it. Change-Id: Ia37f1ce67a003deab424f2b805a2ce333fc10ed4 (cherry picked from commit d3344dd85ee31b195a3709d16e734245e1d0a4b6) Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2012-11-05Fix incorrect shifting of cell notes upon cell insertion / deletion.Kohei Yoshida1-2/+8
Steps to reproduce: 1) Insert a comment at D5. 2) Move cursor to C4. 3) Right-click and select Insert. 4) Choose shift cells down. 5) The comment gets shifted down but it shouldn't. The same thing happens when deleting a cell and shifting content. Change-Id: I5a71845cca6abde6b7c940e152e155da26343cef Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2012-11-05Resolves: fdo#55367 wrong convertion factor for "tspm"Julien Nabet1-1/+1
Change-Id: I80fd050e1bbdc0386c13e0afbeeb404e14b2694b Reviewed-on: https://gerrit.libreoffice.org/849 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/855
2012-11-05Resolves: fdo#35991 rowspan is of size sal_Int32, not size longCaolán McNamara1-1/+1
Change-Id: I347672a2175cf7a0304cf5d6c0f8f3f6afa92cd4 (cherry picked from commit 8bd3bf0ff20fc18a0a6358e36b3f8a7e3b34a2bb) Reviewed-on: https://gerrit.libreoffice.org/919 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2012-11-05fdo#49517: Revert "fdo#46102: Load Java scripts with class loaders [...]"Stephan Bergmann6-54/+9
This reverts commit dd6c4f4db1d62268d73e09ae52d23f760a967dcc "fdo#46102: Load Java scripts with class loaders that actually find them." That commit broke support for macros embedded in documents (as new java.net.URL("vnd.sun.star.tdoc:...") throws a MalformedURLExcetpion), and it looks like that commit was not necessary after all -- or rather that what it tried to work around must have been some other problem that has been fixed meanwhile. "It is unclear to me how the Java script provider shall ever have found the script jars in the past" indicates that something must have been fishy, and what I failed to notice back then is that createURL creates java.net.URL instances with a UCBStreamHandler that does allow to obtain content from weird-looking URLs. Anyway, with that reverted, all three following scenarios work on both current master (towards LO 3.7) and libreoffice-3-6 (towards LO 3.6.4); I haven't yet come around to test on libreoffice-3-5: 1 Stock macros, "Tools - Macros - Run Macro... - LibreOffice Macros - HelloWorld", running all of the four "helloworld.bsh", "helloworld.js", "HelloWorldPyhton", and "org.libreoffice.example.java_scripts.HelloWorld.printHW". 2 Per-document macros, loading test.odt attached to fdo#49517, then "Tools - Macros - Run Macro... - test.odt - HelloWorld", running "org.libreoffice.example.java_scripts.HelloWorld.printHW". 3 Extension macros, installing ScriptDispatch.oxt attached to fdo#46012 as shared extension, then loading StartScriptDispatch.odt attached to fdo#46012 and pressing the "Start Java via ScriptProvider" button. Change-Id: I31cd16b3720ffeb1058722d4d1fdffb773f8a067 (cherry picked from commit 7ea7fb009ddcfb0723e88ba0c5778b5fdbe2b553) Reviewed-on: https://gerrit.libreoffice.org/922 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-11-05resolved rhbz865058 retard overflow of internal table of number formatsEike Rathke1-1/+1
Due to an insane amount of ridiculous "user-defined" number formats the internal table may overflow during import, stave off and increase the number of available slots to another arbitrary limit. (cherry picked from commit 075e9ca0b96f37b3561824c23af60872d6a9d80a) Conflicts: svl/inc/svl/zforlist.hxx Change-Id: I2fb85c83a65d6c5b3183aeb3a3bda88828473a3c Reviewed-on: https://gerrit.libreoffice.org/951 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2012-11-05Remove the correct range, or else maItems would end up with invalid pointer.Kohei Yoshida1-1/+1
nStopPos is non-inclusive, and STL's erase() method also expects a non-inclusive end position (like any other STL methods do). It's wrong to -1 here which would end up not erasing the last element containing a pointer to the deleted cell instance. Change-Id: Ic09ab4a6bb03d0f56bb854a91bf93a99be867116
2012-11-05Related: fdo#47250 fdo#56430 catch harderCaolán McNamara1-1/+1
so duden extension doesn't blow us up Change-Id: Ie6b26670a6809fc07b344660111be44cb3e6a011 Reviewed-on: https://gerrit.libreoffice.org/939 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-05Related: fdo#51247 bandaid to not crashCaolán McNamara1-0/+5
Change-Id: I1f98a6a1e5ede6fcd9a3570788969edcb251384b (cherry picked from commit 63f00d37a20169743d9709977b382c379560ef9e) Reviewed-on: https://gerrit.libreoffice.org/918 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-05Resolves: fdo#47291 polypoly[line|gon] points are signedCaolán McNamara1-4/+4
regression from f6a34255af1339cd7132b7527dc0c10c10d38249 Change-Id: Iabfaf92629cd4d53ab7af5f3e3013eb81bb8104d (cherry picked from commit 2536fae7b8565b5dd9f09bb3dc015576fafe4031) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-11-05Resolves: fdo#50285 merging props unsafe with intermediate charstyle propCaolán McNamara1-2/+4
Its a nice idea to merge properties of the same type and value if one starts and the same place the last one ended. But character styles are properties as well, so if we have character-style+superscript on range a, and character-style+superscript on range b and merge these so that we end up as... character-style on range a, superscript on range a+b, and character-style on range b then that clearly gives the wrong result if applied in that order. So its only safe to merge if there are no intermediate properties that can affect the merge candidates. A regression from b3cee382f449aa69213dc21f7b1ba6a5356d2865 Change-Id: I541563d11265426736b840de068922eef8d45573 (cherry picked from commit 08ffb7bc5ec4472126762f4cb9677349b61122f6) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-11-05fix sdext build with poppler >= 0.19.xRene Engelhard2-4/+8
Conflicts: configure.ac Change-Id: I655e8e15c7f7a8c292b3a1820ee48c29e847d05a Signed-off-by: Tomas Chvatal <tchvatal@suse.cz> Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2012-11-05Detect failing Clang with GCC 4.7 headers and --std=gnu++0x scenariosStephan Bergmann1-0/+3
Change-Id: I6caa48a428ac7fef23f7c3e6fc7896b7e3a8d0fc Signed-off-by: Luboš Luňák <l.lunak@suse.cz>
2012-11-05fdo#55493 fix RTF import of specific PNG imageMiklos Vajna1-6/+12
The image was special in that the resulting Graphic's GetPrefMapMode().GetMapUnit() wasn't MAP_PIXEL. (cherry picked from commit 5ef0f1dc9a70c20fe6879832b782a0c34724353f) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I681e344a042721b99f6cb2e599f9c65156d219a4 Reviewed-on: https://gerrit.libreoffice.org/860 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-05fdo#55939 fix RTF export of footnotesMiklos Vajna1-1/+4
Regression from d4069372484f18b242a42a1996767f57b031fff6. Conflicts: sw/qa/extras/rtfexport/rtfexport.cxx Change-Id: I58e8d48ac3222b795f7edfd0e74ecd86ea36f380 Reviewed-on: https://gerrit.libreoffice.org/913 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2012-11-05deb#690717 fix bashism in /bin/sh scriptRene Engelhard1-1/+1
Change-Id: I43b0065e56b234a5aa748ac1593c29a44fdb1647 Reviewed-on: https://gerrit.libreoffice.org/886 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2012-11-05fdo#53070 fix access violationDavid Ostrovsky1-2/+1
Through that different initialization pIUnknown got random address. The consequence was that if (pIUnknown) pIUnknown->Release(); ends with access viloation in WpBase& WpBase::operator=(const WpBase& rhs) Change-Id: I8b3c5de233d0868fea052c990cc83aed917117ae (cherry picked from commit ac2cfed553b8c9303f86758e9fe8b70911db00cd) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-11-05fdo#56325: Don't forget to build_tree() in fillTable().Kohei Yoshida1-6/+10
Else you'll get the wrong answer in isRowActive(), which always search flag via tree. Change-Id: I3fa92d06f7ba3040eca061d5424afefe362703de Signed-off-by: David Tardon <dtardon@redhat.com>
2012-11-05Don't abort when column has no (Catalog|Schema|Table)NameLionel Elie Mamane1-3/+6
Especially since the rest of the function is prepared to handle no/empty (Catalog|Schema|Table)Name. Change-Id: Ic0bb59ead5789e671c90887ef850588f4924f5e7 Reviewed-on: https://gerrit.libreoffice.org/968 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-11-05fdo#52208 DOCX import: don't always ignore cont sect break at the doc endMiklos Vajna2-2/+11
Regression from commit 1fdd61db155cf63d5dd55cc2bfb45af33796e131, continuous section break does make sense at the end of the doc, if the previous type was a non-continuous. (cherry picked from commit abd4ffadf30e02284290ea35e8f45d9ffd8eb5ee) Change-Id: I6d82c67e068d8dc3ce1edb1a5fe6ad293afd805d Reviewed-on: https://gerrit.libreoffice.org/877 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-11-05fdo#55732 display upper case greek letters in page numbering optionLester1-2/+2
\n\nAll of the code for the constant defining greek upper case page numbering is correct, but the UI dialog that represents that constant displayed lower case greek letters, and vice versa. So, the dialog should display the proper characters. Change-Id: Ib8d0a41928796fbed5f36162c35d6e1db2463e07 Reviewed-on: https://gerrit.libreoffice.org/904 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit e89c99a8ce264173a9d9cbb6df09d7811d6b34cc) Signed-off-by: Eike Rathke <erack@redhat.com>
2012-11-05fdo#52392 dbase: correctly NULL out non-filled in fields in inserted rowsLionel Elie Mamane2-9/+9
Change-Id: Id2e8ad5b6bed1c184de6dccf7fa43254099fb958 Reviewed-on: https://gerrit.libreoffice.org/923 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-11-05Resolves: fdo#48569 crash on export to .docx of inline anchored frameCaolán McNamara2-7/+11
we're currently deferring to the end of the text node to export the contents of frames. If its anchored as character then the sw::Frame (which is allocated on stack) has gone out of scope so this pointer points to junk. Copy it instead. Sill need to export frames property at some stage. Change-Id: Ib9f8c6857ce1afe6acba84986b692139e44a7aad (cherry picked from commit 60a93729c95d31edab50a905236faa9e38a81556) Signed-off-by: Eike Rathke <erack@redhat.com>
2012-11-05n#782597: Allow adding external templatesCédric Bosdonnat2-12/+8
Change-Id: I56d5a716795b7303a77194964a612c550f25eeec
2012-11-05Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6Petr Mladek162-1384/+1893
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 Lillqvist1-1/+1
Change-Id: Ieef2ce470613f6adfbb134d2bd59f2a6fd4a848d
2012-10-31add some new ado constants bnc#787452Noel Power3-0/+55
Change-Id: I1079cf87d223fc03e8cef53f69fa76ea4386c9b8
2012-10-31n#785767 import NS_ooxml::LN_CT_TrPrBase_gridBeforeMiklos Vajna2-3/+8
Change-Id: Id7f1471b49af52e6f6b0515ccd1fe8e12c50d9b5
2012-10-31n#785767 import NS_ooxml::LN_CT_TrPrBase_gridAfterMiklos Vajna2-1/+8
Change-Id: I4cb64ae2b2f2dbf643e38c5208eb759f265acafd
2012-10-30fix character positions translation (partial fix for n#757387)Radek Doulik1-3/+4
Change-Id: I042d6de9533f0f33e1fb64c3b92dc1bafaa6149f
2012-10-30vba procedures and macro names will result in crash, fdo#55174Markus Mohrhard1-0/+4
Change-Id: I23073ecc56482670d185b39452a7d8b9d6eb38c8
2012-10-30hopefully more successful attempt to solve fdo#50304Noel Power1-5/+17
Change-Id: I86dfff571c14bce97d0851b4093dbc376d8b6ea4
2012-10-30n#780645 docx import: properly import table positionPierre-Eric Pelloux-Prayer1-16/+11
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-Prayer2-34/+115
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 Stahl1-27/+24
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 Subramanian1-1/+1
2012-10-29fdo#55931 Fix renderding of subscript/superscript with Autofit Text.Jan Holesovsky1-4/+1
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 Vajna2-8/+1
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 Vajna2-2/+2
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 Bergmann3-92/+49
...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 McNamara1-5/+8
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 Timofeev1-2/+2
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 Tardon1-4/+4
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 Mohrhard1-3/+7
(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 Pruegsanusak1-1/+5
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 Mohrhard2-0/+5
(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 Mohrhard1-0/+4
(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 Power2-10/+10
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 Mohrhard1-4/+14
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>