summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2015-04-19add test-case for EDB-36788Caolán McNamara
Change-Id: I727f0bcee5c506fd524ff1b1b6f9de5f012bed20
2015-04-18testOldComplexMerge: work around buggy libxml by not using //Miklos Vajna
Change-Id: Ia53d7a2aba039386cafcf8d0030c9e768c08b743
2015-04-18silence MacOSX_37-tdf-buildbot failureCaolán McNamara
Change-Id: I2b23d406463168f010c8f2d48889a5a0ff15895c
2015-04-18fix export to rtf of ooo87305-1.odtCaolán McNamara
fold DocxWriteTable into SwWriteTable and make the same improvement to the rtf filter as the docx filter to keep the table writer in sync with the current table, and mirroring the cache improvement of the docx filter into the rtf one Change-Id: Ia0d5972acbe6524da67497defdcbcd26cfdc44fb
2015-04-18loplugin:implicitboolconversionMiklos Vajna
Change-Id: I5c74d150d5e7e35ef9512e6f07bf370c521b0fec
2015-04-17Resolves: tdf#90681 table model can have truly empty cellsCaolán McNamara
old school complex tables can create a table model where a cell exists in the table but there are no paragraphs in it. -------- | A | C | ---- | B |*D*| -------- i.e. normally for the above there are 4 nodes which get exported, even though C and D are merged. But it can be the case that there are only three nodes, and *D* is missing be conservative for now and only do this for the obviously broken no cell start but cell end case and incrementally build up the test-cases Change-Id: I5703595f61688a66b7fac7f3905ace0c207c9875
2015-04-17SwTableLines::size is an unreliable way to count rowsCaolán McNamara
pathological old-school writer tables can have one line here for merged rows The table writer knows about these things, so use that, keep it up to date, and make that up to date cheaper to do Change-Id: I3433206a54c7cb096b699ac0b61653358e647115
2015-04-17RTF filter: export \hyphautoMiklos Vajna
Change-Id: Ide8cb5f45d3eb60c45d86d58a9ab12bbc9f4cf47
2015-04-17fix crash on export of ooo103108-1.odt .docCaolán McNamara
stop pDel->Cut from deleting the pLastFtnFrm that we still need Change-Id: If5dc507ea58c613a581c0528160adaa5ca5364f3
2015-04-17get the vertical span from the reliable getRowSpansOfRowCaolán McNamara
unstead of the unreliable pTblBox Change-Id: I083560fdbcf83173c5f3c42267ca2d8e4e6d9a17
2015-04-17incredibly dubious hunk of codeCaolán McNamara
from commit 0415e2696156b25226f21085a0716187f83c2f4b Author: PriyankaGaikwad <priyanka.gaikwad@synerzip.com> Date: Thu Feb 27 17:42:52 2014 +0530 fdo#73219 File corruption: Table in header Description: File corrupt due to the end tag </w:tc> </w:tr> </w:tbl> are missing after roundtrip in header4.xml Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8378 Change-Id: Ib05a50b3b3beca6c744b93360f9341ddcaa1a22a Change-Id: I93ecadf7bfd2d19da33611e82ba95c4106bda2a5
2015-04-17loplugin:implicitboolconversion clean-upStephan Bergmann
Change-Id: I049b2eec5b2201f4056bb6e7b9b97e7763e5e214
2015-04-17SvStream: WriteUChar -> WriteBoolStephan Bergmann
Change-Id: I89aa0e22c31d368ab36fe46917db6aacb11c7b14
2015-04-17loplugin:implicitboolconversion gold?Stephan Bergmann
The code was like that ever since 84a3db80b4fd66c6854b3135b5f69b61fd828e62 "initial import" but looks very much like the intent was to make the conditional operator bind tighter than the less-than operator. Change-Id: I810aa5dc56f02e98111f4879db50c59a9b69b8d6
2015-04-17refactor a tiny bit for future plans, no change in logicCaolán McNamara
Change-Id: If104cdbc7e9d38c9664492f433c53ee5ffb59578
2015-04-17it has always been the case that RowSpans are signedCaolán McNamara
we just get away with this because we cast it to signed before use in ww8 Change-Id: I646ea3a0eb84923dd9835f18356d67f4f72ba18d
2015-04-17Writer export: don't update doc stat using SkipImagesLászló Németh
to speed up text extraction Change-Id: Ifa81483f537c8a79326c40fb610201f0bbbcc97a
2015-04-17tdf#86182 RTF import: fix handling of \rtlparMiklos Vajna
Commit 558d5c25a0b1d6a937d33291a4b6cd7fca6cb15b (implement RTF_LTRPAR and RTF_RTLPAR, 2011-06-09) was just a guess, this one is the proper mapping. Change-Id: I1156ef5ddc34264d761d3e64dd0537bc6ec0ced7
2015-04-17convert SCRIPTTYPE_ constants to scoped enumNoel Grandin
Change-Id: I5be3980ac865162d8d7626556ca47eca4b0ee433 Reviewed-on: https://gerrit.libreoffice.org/15344 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-04-16Use C++11 std::vector<T>::data()Stephan Bergmann
...all uses of bytes::data() look like they're fine with std::vector<T>::data() not necessarily returning nullptr when empty Change-Id: I48c3877cfb9fb1a4a129bd1e072410a8bebc87b1
2015-04-16RTF import: fix handling of \objdataMiklos Vajna
There were two problems here: 1) The input stream is read multiple times, so plain naive XInputStream is not enough, XSeekable is needed, as it is the case for the stream provided by the OOXML tokenizer. 2) Seeking to the correct start position is not enough, code using the stream will assume that seeking to the beginning of the stream allows reading the correct data again, so provide a dedicated stream instead. With this, handling of math equations created by Word <= 2007 and embedded to RTF files can be edited finally. Change-Id: Ic225e1e1060f8bdd5651a21e68970620c9ac6b68
2015-04-16coverity#1294408 Logically dead codeCaolán McNamara
pre recent refactor pBox was assigned NULL on the now early return pLines->empty() path Change-Id: I6ecb31afc7a70fd5e11ff474145fd0e73dc33cef
2015-04-16Revert "make more classes dllpublic"David Tardon
This reverts commit add2ca7b3ab10ed9d18e60d8e50020168d922836. It causes too much breakage on windows. It is better to start again from scratch.
2015-04-16make more classes dllpublicDavid Tardon
... to fix asan+ubsan+dbgutil build Change-Id: I1400774d383879bbff9bf28251a104cd53bafaed
2015-04-15move unocrsr to unocoreBjoern Michaelsen
Change-Id: I1a3185e89e68b4d85221b8296fe9ffad8b18de5f Reviewed-on: https://gerrit.libreoffice.org/15335 Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-04-15DBTOOLS_DLL_NAME not used anymoreMatúš Kukan
Change-Id: Ieb9a373e4d59bfe72a7709bd7822617f9877054a
2015-04-15DOCX import: convert MathType to Math if MathTypeToMath is enabledMiklos Vajna
With this, math equations created by Word <= 2003 and embedded to docx files can be edited finally. Previously the result was read-only and opened in an unexpected new window. Change-Id: I4f9dd1cca4a149959f6151cf9af9242b53190ef5
2015-04-15sw: DrawFillAttributes: move check for empty rPaintRegionMichael Stahl
Tweak c2c22d26db03949771d5a0bb4f8abf6d2dc850ea a bit: if the paint region is empty, nothing should be painted. Change-Id: If88b8153f701b1f21cfd2300f0af532f5c718cdf
2015-04-15convert TXTFORMAT constants to scoped enumNoel Grandin
and move them to the SW module since that is the only place they are used Change-Id: Ic037e5ac9d2514377669c5f583b856e1da429a19 Reviewed-on: https://gerrit.libreoffice.org/15303 Tested-by: Noel Grandin <noelgrandin@gmail.com> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-04-15convert SFX_ITEM constants to scoped enumNoel Grandin
Change-Id: Ief8c30c356ba947727c5ab70092042816a0db99e Reviewed-on: https://gerrit.libreoffice.org/15302 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2015-04-15convert SFX_VIEW constants to scoped enumNoel Grandin
Change-Id: I327dc1ec722fa9445f13fc5168ad646e272ba9d4 Reviewed-on: https://gerrit.libreoffice.org/15300 Tested-by: Noel Grandin <noelgrandin@gmail.com> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-04-15fix crash on re-export of fdo39974-1.odt to odtCaolán McNamara
Change-Id: Ib4246987a3665f655ad44339ade0350b074c3266
2015-04-15remove unnecessary use of void in function declarationsNoel Grandin
ie. void f(void); becomes void f(); I used the following command to make the changes: git grep -lP '\(\s*void\s*\)' -- *.cxx \ | xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;' and ran it for both .cxx and .hxx files. Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
2015-04-15Uncaught exception at HTML export of embedded objectsLászló Németh
Using SkipImages FilterOptions with HTML export, LibreOffice tries to export the content of the embedded objects, too, but it seems, we get only exceptions for a simple test document, too. Change-Id: I756ca79b183c0ee2f2be712df799a97612f9475b
2015-04-15tdf#90594: MM: Fix for broken translation between Bookmarks and row indizesChristoph Lutz
The datasets used in the unomailmerge service can be selected via a property "Selection". This property expects a sequence of sdbc::Bookmark elements that need to be translated into row-inizes. This translation was broken - the loop-pointer pTranslated was never incremented which caused a wrong "result" selection in which only the first element was changed. Change-Id: I319131caa89e327b11406ab7d0c56a833385d433 Reviewed-on: https://gerrit.libreoffice.org/15289 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-04-15-Werror,-Wunused-private-fieldStephan Bergmann
Change-Id: I27afea85c339cf2239ed118cf6cedaece032dfae
2015-04-14Remove checks for HTMLMODE_SOME_STYLESHarri Pitkänen
HTMLMODE_SOME_STYLES is enabled if we are in HTML mode (it is enabled for all HTML modes). These checks for conditionally disabling some table background controls are not needed anymore. Change-Id: I10fb73a67ac4bba250da4cea79ff6bae427a1613 Reviewed-on: https://gerrit.libreoffice.org/15264 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-14tdf#89478: svx: ODF import: SvxBrushItem Graphics should override ColorMichael Stahl
The bugdoc has: <style:page-layout-properties fo:background-color="#007f7f" > <style:background-image xlink:href="Pictures/2000003900002FA3000055F455EC9F63.svm"/> </style:page-layout-properties> In this case it's clearly better to prefer the Graphics. The old code could actually store both in the model but the UI only allows setting either Color or Graphic, so this should be good enough. (regression from 7d9bb549d498d6beed2c4050c402d09643febdfa) Change-Id: Id33231ad90815d9791f90289fb0b55455d334c14
2015-04-14tdf#88337 tdf#89193: sw: add missing SwXPageStyle propertiesMichael Stahl
Add the fill style properties so background images etc. are not lost. (regression from 7d9bb549d498d6beed2c4050c402d09643febdfa) Change-Id: I517350eec2f32e4b4bb80427666aad23a31d666a
2015-04-14tdf#88337: add test documentRegina Henschel
Change-Id: I7e5f28f6cc8010ac233d58cfa6a2158e3f7be90b
2015-04-14solve assert on restoring redline mode on exporting of abi9915-1.odt to docCaolán McNamara
see also on export of ooo103014-1.odt to doc and many more easiest thing is to move the restoration of the redline mode upwards for all filters to the central SwWriter::Write after all pams have been destroyed. Change-Id: Ieb747ad2ed465d3fd3de81db0ef820073bc3ab55
2015-04-14tdf#88710 Kill svx dbtoolsclientMatthew Nicholls
Removes dynamic loading logic described in tdf#84315, similar thing removed in swdbtoolsclient. Change-Id: I8762102a7263e6933354c2ff6f9978929b760f6e Reviewed-on: https://gerrit.libreoffice.org/15147 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-04-14fix crash on export of novell606043-1.odt to docCaolán McNamara
Change-Id: I91478cf0a9b128f96dab5be67d018af46d75bd4f
2015-04-14fix MAXTABLECELLS related crash on export of ooo106020-1.odt to docCaolán McNamara
word has a limit of MAXTABLECELLS cells in a row, we were clipping the rowspan container to that max, but not the cell container Change-Id: I5274dc7febd47e6c8c8e5337f638972b65239922
2015-04-14SwRTFWriter::OutRTFBorder is gone, so no merging needed anymoreCaolán McNamara
Change-Id: Ie60c09d7b7c626a0a7624e4c833d72eb5d0d5965
2015-04-14have a nonsymetric test table to better catch transpose errorsBjoern Michaelsen
Change-Id: If36ec5ed78a3e0b7a9037eaa1903772f1d228bce
2015-04-14Related: tdf#90130 gradient transparency goes missingCaolán McNamara
Change-Id: I0af8eb24dab7bb9f5831bec68f9a22ba88c2be19
2015-04-14DocxAttributeOutput::m_postponedVMLDrawing: use std::unique_ptr<>Miklos Vajna
Change-Id: I2534601941c6bf838855a378c540771335daf5f9
2015-04-13Resolves: tdf#90130 don't clobber new solid-color on seeing old transparencyCaolán McNamara
Change-Id: I1ea86dca37cbce416564c5e198779dd132125b02
2015-04-13add some label testsBjoern Michaelsen
Change-Id: I4272be68041a269dce3bbd9de2bc7997cbcf9ab8