summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2014-02-13fdo#73541 "Page Margins : Mirrored" was not preserved on export to DOCXVinaya Mandke4-0/+27
Mapped Property at import, so Page margins mirrored are imported correctly. Also exported the mirrorMargins in settings.xml Added export UT for the same. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7632 Change-Id: I2d90643f55e1dc1d96c809e28ce37dee4653bf57
2014-02-13Fix for: DOCX-Preservation of Line style Dash type of "Shape with text inside"Pallavi Jadhav5-1/+29
Issue : File containing Shape with text inside it having Line style as Dash type is not getting preserved after RT in MS office 2007. Implementation : 1] Added XML element <v:stroke> with attribute dashstyle="dash". 2] Written Export Unit test case. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7611 Change-Id: Id01c5975c2c1cf176a7459f65973f4c9c3c9b9d8
2014-02-13fdo#69646 Export of table with auto-width, at least one column with auto-widthsushil_shinde3-9/+34
- In case of auto width to table it should export as auto. - Added Unit Test to check it is properly exporting table. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7594 Change-Id: Id448111b81110bbc6c109f3da9195075b9b8a9fc
2014-02-13CppunitTest_sw_ooxmlimport: make this actually test something againMiklos Vajna1-3/+2
Change-Id: I05d8b0dafcdea68d57137873ea52d4ab28a9b12b
2014-02-13fdo#69656 table with auto-width and at least one column with auto-width.sushil_shinde2-1/+8
- In case of auto width of table and atleast one cell of table is auto width It was setting table width to 100% relative width. - hence it was causing rederening problem, table width was wrong while rendering. - Changed 100% hardcoded value, now setting total width of table as per grid values. - modified one UT since we no longer setting width of table to 100% default in case of 'auto' width. - Added one UT to check proper table width while importing. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Reviewed on: https://gerrit.libreoffice.org/7593 Change-Id: Iae396c632eb1ef0c06efaa8c1965e4a68f12c6b1
2014-02-13FDO#74430: File Corruption due to repetition of docPr Idumeshkadam2-3/+6
Issue : - If there is a scenario where a chart is followed by a shape (may it be in the footer or on a different page ) which is being exported as an alternate content then, the docPr Id is being repeated, ECMA 20.4.2.5 says that the docPr Id should be unique. - Two different variables were been used as counters for the docPr Id, hence there were repitions in the docPr Id. Implementation : - ensured that a single counter is used to track the docPr Id. Conflicts: chart2/qa/extras/chart2export.cxx Reviewed on: https://gerrit.libreoffice.org/7916 Change-Id: I1c105be184d045ef058423f03259eb8c634fcbbe
2014-02-13Drop unnecessary #includeTakeshi Abe2-2/+0
Change-Id: I9bc9c21811100d6cc1ee7e381a3735567e3bda34
2014-02-12sw: replace #ifdef'd operator<<Michael Stahl1-1/+1
Change-Id: I63c24f453f843a363fc056879d652f28d7052f1e
2014-02-12remove SvStream::operator>> methodsNoel Grandin1-8/+8
in favour of ReadXXX methods. Change-Id: Ic2c0a7b6b92ff4c236ae99b39d77f3d935b301e3 Reviewed-on: https://gerrit.libreoffice.org/7915 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-02-12more SvStream:operator>> conversionNoel Grandin2-5/+5
Convert the template based read_lenPrefixed methods to regular methods. Change-Id: Ifd0e93aca055e55a0575e4377ec2b8e266dfb019 Reviewed-on: https://gerrit.libreoffice.org/7895 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-02-12convert SvStream::operator>> methods to ReadXXX methodsNoel Grandin15-394/+394
First, I updated the clang rewriter to do the conversion. Then I lightly hand-tweaked the output for the few places where the rewriter messed up, mostly when dealing with calls on "this". Change-Id: I40a6a977959cd97415c678eafc8507de8aa3b1a9 Reviewed-on: https://gerrit.libreoffice.org/7879 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-02-12DOCX drawingML import: fix relative size of group shapesMiklos Vajna2-0/+6
Change-Id: I5a126bd9eaacaee2e080837a34d8ac41cbb9ea10
2014-02-12SwAnchoredObject::dumpAsXml: show bound rectMiklos Vajna1-0/+8
Change-Id: I1754850d7674efb53c95886c3c3cdcde8ca6ee4d
2014-02-12fdo#66822 - refactor HTML export of image to bullet listTimothy Markle4-61/+7
Replaced src attribute with style attribute in <ul>. Removed invalid width, height, and align attributes. Removed two unused variables rSize and pVert. Change-Id: I40390bd02c7fb11a445da44d33492a59c8e6372c
2014-02-12coverity#738374 Uncaught exceptionCaolán McNamara2-2/+6
Change-Id: I68e317d7f7a419ed5901d745a9477e0d4570db45
2014-02-12coverity#738381 Uncaught exceptionCaolán McNamara2-2/+4
Change-Id: Ie94bd97976f98cad5f21c96ef7344d4e66983fcc
2014-02-12coverity#738382 Uncaught exceptionCaolán McNamara2-2/+3
Change-Id: I927b3a9b4961f733a41b917929b304196d273fc7
2014-02-12coverity#738383 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: I70c710fe93aa864c2b1ca15d7ae1c04a158c149d
2014-02-12coverity#738385 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: I74c6b17ce72f1c8d4bb8c47e6745f1471b4b4580
2014-02-12coverity#738387 Uncaught exceptionCaolán McNamara2-2/+9
Change-Id: I5950be0f874587ed3f4776b329401e43e6407bda
2014-02-12coverity#738392 Uncaught exceptionCaolán McNamara2-2/+7
Change-Id: I342ab51f99fd589e79bf650befc5506ab04c3fc0
2014-02-12coverity#738397 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: I727cc99662cd5bb93a795e51744086c0e005152e
2014-02-12coverity#738398 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: I51d0c9feaf34482382451d77ce39eec84d10f01f
2014-02-12coverity#738400 Uncaught exceptionCaolán McNamara2-4/+7
Change-Id: I8567bda45c4f1c9d90dbbf69368a74e27b79d9b0
2014-02-12coverity#738402 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: Ic70b2b39d45a1e69be525071f9da214ccc4c5422
2014-02-12coverity#738403 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: Ie8b6586b29976abddd204ad5150edda13bf27230
2014-02-12coverity#738405 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: Id6a851ec0799e2064b4b20c4a5dcefa4d5b81ee1
2014-02-12coverity#738409 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: Ide9369142230f1f2732aff1e6242299580eb9e65
2014-02-12coverity#738411 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: I9ef08a451101a65816d3ee00d4bf6e27c536eb0e
2014-02-12coverity#738412 Uncaught exceptionCaolán McNamara2-2/+5
Change-Id: Iece48b2b8682b38854ca50f158587f9de050e71f
2014-02-12SetCaptionFmt never called, so pCaptionFmt always NULLCaolán McNamara4-105/+4
Follow logical consequences of the always-NULL. And, depressingly, big slabs of the IA2 caption code in writer doesn't actually do anything. Change-Id: I35f7ffac19db683010b656b3c88f81b65233b080
2014-02-12callcatcher: update unused codeCaolán McNamara2-32/+0
Change-Id: Iaaad9302ef8edb47fa95ce8ca608b6f36449521b
2014-02-12drawingML import: picture with scheme colorZolnai Tamás2-0/+23
Theme fragment must be loaded for pictures too. Change-Id: If4c412926319df2beaecfc120065bd011fc3eb57
2014-02-12drawingML export\import: cropping of shape's fill textureZolnai Tamás4-1/+49
In Writer shapes had no cropping property so far. With this commit this is introduced as a FillProperty and has the same type as the cropping used for pictures (Picture context menu > Picture > Crop). Layout and UI will be an other step. On the UI it would be placed on the Shape context menu -> Area, when Bitmap is selected as fill type. Note: In case of picture/graphic, cropping property is imported from and exported to a:srcRect instead of a:fillRect. Change-Id: Idc1ed2d40cb20b6992e94f14e7e4d853e1f55d02
2014-02-12DOCX export: avoid 0 or 1 relativeHeight when it's a real valueMiklos Vajna3-1/+11
The z-order can be any number, Word uses kind of random 32bit integers, we count from 0. It turns out 0 and 1 may have some special meaning, as counting from 2 (instead of 0) fixes the visibility the problems in the bugdoc. Change-Id: I695a625fc0ab8206cc09896bcf02ff7689f1defc
2014-02-12Export MailMerge cancel functionality via UNO.Jan-Marek Glogowski4-6/+53
If you start a mail merge jobs via UNO, there is no way to cancel it. But the functionality is already implemented and used by the LO internal mail merge dialogs. This patch adds an optional XCancellable interface to the MailMerge service and implements it in the SwXMailMerge class. As the XJob::execute function already uses the SolarMutex to prevent parallel runs, XCancellable::cancel can be implemented by storing the SwNewDBMgr in the private variable m_pMgr, protected by a mutex. The bCancel member has to be converted from a bitfield value to a real boolean, because otherwise all bitfield values would have to be protected by a mutex. Bitfield assignments aren't atomic as you always have to replace at least a byte. Change-Id: I007cc23fdf04ccfca7d3cd6180b0e17e99f53061 Reviewed-on: https://gerrit.libreoffice.org/7190 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-02-12Add unit-tests for DOCX preservation of 'table cell redline'Adam Co3-0/+16
Added unit-tests to make sure that 'table cell redlines' (e.g. - table cell was inserted \ removed) are being round tripped correctly from a DOCX file. Change-Id: I773cb51a39654d2640200489d5199361b56396c7 Reviewed-on: https://gerrit.libreoffice.org/7878 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12DOCX Export of 'Table Cell Redline' (like insert cell or delete cell)Adam Co7-0/+61
This patch adds support in the DOCX exporter for exporting the 'table cell redlines', such as 'inserted a table cell', or 'removed a table cell'. Change-Id: Ic37d2550691f1090a580dae57d597c8fd09c7ad9 Reviewed-on: https://gerrit.libreoffice.org/7877 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12Add XML dumping of the new 'SwTableCellRedline'Adam Co1-0/+3
Change-Id: I4072130ff0ce712f02d1dd8f12003170116216a2 Reviewed-on: https://gerrit.libreoffice.org/7876 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12DOCX import sends 'table cell redline' to SW core, and core stores itAdam Co3-0/+80
This patch adds support in the DOCX importer for the 'table cell redline' to be sent from the DOCX importer, using UNO (as a property of the table cell) to the SW core. Once it reaches the 'table cell' - the 'set property' detects this property - and creates an 'SwTableCellRedline' object for it, and adds it to the 'SwExtraRedlineTbl' object. Change-Id: Iba038f4109d5505b94cea548e73c614b5cc1b637 Reviewed-on: https://gerrit.libreoffice.org/7875 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12Rename 'makeTableRedline' to 'makeTableRowRedline'Adam Co3-4/+4
Change-Id: I257ef3cc360c74fb83c65e4be9967e9f84ba9af3 Reviewed-on: https://gerrit.libreoffice.org/7874 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12Add support for 'Table Cell Redlines' in SW coreAdam Co4-0/+92
This patch adds support for 'Table Cell Redlines' (such as 'table cell inserted' or 'table cell deleted' in SW core). It adds the 'SwTableCellRedline' object, and adds a function for adding objects of that type to the 'SwExtraRedlineTbl', which is the object that holds all the redlines which are not 'Ranged' redlines. Change-Id: Ic2e410be58683f171ea07d430b7544600780711e Reviewed-on: https://gerrit.libreoffice.org/7873 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12Add unit-tests for DOCX preservation of 'table row redline'Adam Co3-0/+16
Added unit-tests to make sure that 'table row redlines' (e.g. - table row was inserted \ removed) are being round tripped correctly from a DOCX file. Change-Id: I369dd32e7372d0cf0add19197f07d0ad604e9ef0 Reviewed-on: https://gerrit.libreoffice.org/7849 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12normalize values of SYSTEM_FREETYPE, SYSTEM_LIBXML, SYSTEM_MARIADBMichael Stahl1-1/+1
Change-Id: Iffcc671ca41c5880579effe0786a3b4d3be0dab0
2014-02-12DOCX Export of 'Table Row Redline' (like insert row or delete row)Adam Co7-0/+61
This patch adds support in the DOCX exporter for exporting the 'table row redlines', such as 'inserted a table row', or 'removed a table row'. Change-Id: If07e3496d8cab8b93b10c6ae3bcaec49369a8c2d Reviewed-on: https://gerrit.libreoffice.org/7825 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12Added some 'To-Do' notes regarding the new 'SwExtraRedlineTbl'Adam Co6-0/+38
These notes are to make sure if logic needs to be added for the 'SwExtraRedlineTbl' in these functions, in addition to the 'SwRedlineTbl' that is already there. Change-Id: I7778b4e20f5323a925d05a7df0c727f443566662 Reviewed-on: https://gerrit.libreoffice.org/7823 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12DOCX import sends 'table row redline' to SW core, and core stores itAdam Co3-38/+123
This patch adds support in the DOCX importer for the 'table row redline' to be sent from the DOCX importer, using UNO (as a property of the table row) to the SW core. Once it reaches the 'table row' - the 'set property' detects this property - and creates an 'SwTableRowRedline' object for it, and adds it to the 'SwExtraRedlineTbl' object. Change-Id: Ifd9ba680a722b54116b07dca54841dcba599c517 Reviewed-on: https://gerrit.libreoffice.org/7822 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-02-12cid#736071 missing break in switchNoel Grandin1-0/+1
Change-Id: I5a15a1410426ad0941dbb2b73aaf31f78db19362
2014-02-12At least assert hereStephan Bergmann1-0/+2
...or is that assumption incorrect and GetOldPageDesc should rather return a pointer that may be null? Change-Id: I256b9085d5143c3cf2f8d3146d109c3c99edffc2
2014-02-12Do not reference a dangling OUStringStephan Bergmann1-1/+1
Change-Id: I0908d1300d0d1acb515345ccbdf6cdc2bf44d6a5