summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2014-03-18fdo#75260: Apply the same fix from writer table to character bordering.Kohei Yoshida1-12/+20
And mirror the right and bottom borders while I'm at it. I guess it was originally meant to. Change-Id: I408b077c1524d19bbadd6f0b284ce204064eb735
2014-03-18fdo#75260: Apply the same fix from writer table to paragraph bordering.Kohei Yoshida1-0/+20
Change-Id: Icb11a2e2f802cbf2af2362315f3acbc66f15334d
2014-03-18testcase for fdo#38414Luboš Luňák2-0/+7
Change-Id: I9467ae2ba5155175d5be8218248edada136a5ca1
2014-03-18add messages to utility test functionsLuboš Luňák1-5/+5
So that e.g. parseDump() in case of an incorrect xpath does not just plain give an equality assertion failure, which on its own is confusing. Change-Id: Ib9fc2b4f6720b5c472773afbe8dc18cd8961465c
2014-03-18workaround for rounding errors when handling merged cells (fdo#38414)Luboš Luňák1-3/+13
Change-Id: I4d36e4b86c77a7356a8c221cbfc5735e925392ba
2014-03-18swui needs icu_headers now too.Matúš Kukan1-1/+4
Change-Id: Ic416289d93f9e2a5bc0b3a1016d6222cfc724912
2014-03-18Add a couple SAL_INFOsTor Lillqvist2-1/+6
Change-Id: I3773f5432ff4e2a005e0c67d9c65fdb00de6f16b
2014-03-18fdo#75260: Center both primary and secondary lines wrt thier respective axes.Kohei Yoshida1-20/+1
The closed borders connect much better this way. Now all double lines look at least half-way decent. Also, we shouldn't be doing any sort of pixel correction in the common code that gets used both raster and vector drawing modes. In case we need to do some pixel correction, we should do it in the pixel processor code. Change-Id: I78e245c10752d0f4790a9ac664a14ce06571434e
2014-03-18Related: #i56998# use locale rules to format percentageCaolán McNamara2-3/+7
Change-Id: I9d27359fe2c343593455eebf69bca6efdb7c5079
2014-03-18fdo#75260: More adjustments.Kohei Yoshida1-11/+19
1) Offset top and left border lines only for double lines. 2) Don't apply zoom level scaling to border widths. That's used for line pattern spacing only. Change-Id: I12bdd1492531cc6651e22955c3dca4bdda0f1e4c
2014-03-18convert wizard layout page to .uiCaolán McNamara8-245/+509
Change-Id: I40ae0f7dea51bf0b8db60ec6b3cac955e9016af4
2014-03-18convert salutation wizard page to .uiCaolán McNamara7-219/+629
Change-Id: I31d352038175cde43020655546c8216ab4442e3e
2014-03-18fdo#75260: Correct offset amount. Using the distance was not enough.Kohei Yoshida1-1/+1
Change-Id: Ie27e2c0785eaf8d2106c1fd60e9da112da048f38
2014-03-18fdo#72775 : LibreOffice hang while opening some documentsTushar Bende2-0/+7
Description: There was a problem for some documents, when opened in LibreOffice there was continuous increase in page numbers.And this was the reason for LO getting hang. The wrap property "NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_auto" was not handled in DomainMapper::lcl_attribute() and hence paragraph's wrap property was getting set to "text::WrapTextMode_NONE" this was the reason for increasing number of pages while opening doc in LO. added condition to handle NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_auto. *added test case to verify that the document is opening properly and checking it's page count. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Reviewed on: https://gerrit.libreoffice.org/8632 Change-Id: Id24ebc8409e7fd53915e5130beb9ad6f8bb8571f
2014-03-18convert address block wizard page to .uiCaolán McNamara7-295/+666
Change-Id: I38c0c7262dffaaf5280e2c000eb122f71203e385
2014-03-18sw: not used getter / setter methodsMiklos Vajna2-15/+3
Change-Id: Id357ee22d041cd191d06b0dc2dbf162312a4df0a
2014-03-18fdo#76249 DOCX export DML Drawing as lockedCanvas if it's inside DMLTextFrameVinaya Mandke5-1/+66
The Locked Canvas is imported correctly, but while exporting the drawing is exported inside a textbox. However a locked Canvas has to be exported inside a text-box for the RT file to work in MS Word 2010. As dml drawing elements are not allowed in the dml textboxes. Export as Locked Canvas iff the drawing was originally a Locked Canvas and is now inside a DML Text Frame. As otherwise the Locked Canvas is exported correctly as a DMLDrawing. Reviewed on: https://gerrit.libreoffice.org/8618 Change-Id: Ifa350d8922a22c4e480411530aa4d953bd3ed2ac
2014-03-18oox: fix DOCX strict import of SmartArtMiklos Vajna2-2/+9
Change-Id: Ied8283e17ec4379f218dc60912e1c41ca28a8ac9
2014-03-18convert select multi paths dialogs to .uiCaolán McNamara1-1/+1
Change-Id: Iecb6dbee9e7af0600b8355db038ec597cab61d1a
2014-03-18CppunitTest_sw_ooxmlexport: disable failing check on Mac for nowMiklos Vajna1-0/+3
Change-Id: Ib5993eef9722d1ff0c6eae3dc65aa43572f1bbd8
2014-03-18sfx2: sal_Bool->boolNoel Grandin4-8/+8
Change-Id: I375a72c34e46778385a9fdc24c9ebd0f0a3f3c9b
2014-03-18sfx2: sal_Bool->boolNoel Grandin1-2/+2
Change-Id: Ib2a02c7e05e48657b9745bcccc8f8f626daaef2d
2014-03-18sfx2: sal_Bool->boolNoel Grandin20-68/+68
Change-Id: I87c5a180566e9da185c2992844e6522e82c17747
2014-03-18sfx2: sal_Bool->boolNoel Grandin1-1/+1
Change-Id: I128430fe446eb517b42a109a868b88d49bbc4eaa
2014-03-18sfx2: sal_Bool->boolNoel Grandin2-6/+6
Change-Id: I733cd63e321bdc775739228c269fa66ff7780780
2014-03-18sfx2: sal_Bool->boolNoel Grandin4-5/+5
Change-Id: I01a33e255b0dd2a0045f6eed52e6b31305750599
2014-03-18adapt CppunitTest_sw_ooxmlexport to 6820dec8903b182260340c638c35b5a5ca207a85Miklos Vajna1-1/+1
Change-Id: I718829fe4821f36a37b0503be18c56d1151abd9c
2014-03-17fdo#76195: Set the border type to NONE to ensure it won't be drawn.Kohei Yoshida1-15/+27
We can no longer rely on the width being zero for no border condition. Change-Id: I02c5c825661b4a0aa4190306e8276bdfd8bff944
2014-03-17fdo#75260: These old hacks no longer make sense.Kohei Yoshida1-21/+0
The clip region in fact cuts off the lower part of the bottom border, both on screen and when printing / exporting to PDF. Change-Id: Id350531f09b3ded66fd05ea7ebeefe8771260b62
2014-03-17ooxml: preserve several simple types of sdtJacobo Aragunde Pérez3-9/+38
This patch is to preserve the sdt blocks for several simple sdt types: equation, picture, citation and group. This patch reuses the infrastructure created at commit 55211e612d2cbed03dd81c039d07ea4e936c2804 to grab-bag the properties of the sdt block and write them back on export, with small modifications in particular related with the fact that these tags don't have children. The type of the property tags equation, picture, citation and group was modified in the ooxml model file to be able to process them. They were previously empty. A unit test was added to check the preservation of these fields. Another had to be modified. Change-Id: Ica1a340f589f5d6c85c1a35d2a3a4bf930eb2d8a
2014-03-17fdo#76108 : The RT file is getting corrupted.Sourav3-7/+15
Description:The RT file is getting corrupted. The <w:fldChar w:fldCharType="end" /> tag is there inside the hyperlink tag where as the <w:fldChar w:fldCharType="begin"> is starting before the hyperlink tag.This is causing the issue. The rootcause found is in DocxAttributeOutput::EndRun(). A check is introduced before the code that writes the <w:fldChar w:fldCharType="end" /> after the hyperlink to check if the m_startedHyperlink is false. I have added test case to verify that now the RT file is opening I also verified this change on a set of 440 real world documents (containing many combinations of MS Office features) to make sure there is no regression because of this change. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8603 Change-Id: Ibc3ca8edcfb68d52a9394580bac1ce878eda9405
2014-03-17FDO#76107 : RT file gets corrupted for files having paragraph/page commentsumeshkadam3-6/+33
- In case of multiple paragraph comments/ page comments there used to be a mismatch while relating the comment id's in document.xml and comments.xml - This was happening because the annotation mark id's were getting overwritten. - Fixed this issue and added UT for the same. Change-Id: Ie0ac6b5c865555d143115a79b3fc146f9a4ef5fc Reviewed-on: https://gerrit.libreoffice.org/8602 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-17fdo#76109: LO Crashes while opening the docx file containing three fieldsDinesh Patil2-0/+11
- DOCX file containing fields BIBLIOGRAPHY on first line, BIDIOUTLINE on second line and CITATION on third line is getting crashed while opening in LO - Fixed this issue and added unit test case for the same. Change-Id: Ia8394a3a26157f88693edcf60b0161947d8a9ac0 Reviewed-on: https://gerrit.libreoffice.org/8589 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-17ooxml: preserve w:sdt blocks containing w:docPartObj propertiesJacobo Aragunde Pérez4-9/+88
The <w:docPartObj> property inside <w:sdt> blocks determines a block inside the document that can be dinamically updated and enables Word 2010 to show a hover button to update it. It is used for TOCs, bibliography, etc. LibreOffice ignored these blocks and removed them from the document on export. In this patch, we make the importer save the <w:docPartObj> tag and its contents in the paragraph interop grab bag. On export we read the paragraph grab bag and restore the sdt block back to the document; we don't know if the paragraph must be enclosed in a sdt block when we start it, so we used the parser marks to be able to prepend the start of the block before the paragraph opening tag. The grab bag on import is managed by the SdtHelper class. Added a set of methods for that purpose. The ooxml model file was modified to assign token ids to the children of w:docPartObj. Fixed several unit tests that didn't expect the <w:sdt> tag to be exported. Also modified testBibliography inside ooxmlexport test suite to add checks for this patch. TODO: in the imported documents the sdtContent block may contain several paragraphs but the exporter code as it is can only wrap one paragraph. As a result, if the sdt block contained several paragraphs the second and next paragraphs will be outside the block in the exported document. Change-Id: I5333fc5ad91a3c50198a4f7647424a2101268c12
2014-03-17sw: prefer passing OUString by referenceNoel Grandin67-144/+148
Change-Id: Iaa846ec8f19567f0a9f30154d74cc53df93eff16
2014-03-17Fix fdo#75936 set limit for decreasing indentabdulmajeed ahmed1-1/+2
Change-Id: I566f93f7e6f9a5bcff75094b51aaa4ee79e6890e
2014-03-17Fix whitespace.Jan Holesovsky1-2/+2
Change-Id: I3156581bb0cf9c23b8d643d6d0c787feac56d266
2014-03-17fdo#47355: partially revert c5a8a2c3cbcee0175127a0662e3d820ea4deea22Bjoern Michaelsen1-8/+0
- that commit claimed to fix i#84870 - however that example document _still_ loops for me on current master even with the change - this caused the fdo#47355 regression in addition - thus reverting to heal fdo#47355, expecting i#84870 unchanged as broken before and in need of a proper fix Change-Id: I067a8ef222ee2af6cd97579451c40ddba53ca294 Reviewed-on: https://gerrit.libreoffice.org/8606 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2014-03-17DocxSdrExport: m_pImpl->m_rSdrExport == thisMiklos Vajna1-2/+2
Change-Id: I0c058a1042f5235d19d5ede2426ace8e13d2a853
2014-03-17fdo#76122: File Corruption-doc contains nested alternateContents.YogeshBharate4-9/+30
Problem Description: - After roundtrip, files contains <mc:AlternateContent> in <mc:Choice>. - Due to this document gets corrupted when we open it in MS Office 2010. - Added unit test. Change-Id: Ic64b815eda4a42cd59f522ac4570ae145b0b38e1 Reviewed-on: https://gerrit.libreoffice.org/8575 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-03-17fdo#76098 ContentType for .xlsm external data file is wrongRavindra Vidhate4-1/+19
1. Open a File which has Pie Chart in LO. 2. The content type of Pie Chart should Macro Enabled. 3. using LO, SAVE this file. 4. Opened the Save file in MS-Office. 5. The file gets corrupted due to the ContentType gets changed. Conflicts: sw/qa/extras/inc/swmodeltestbase.hxx Reviewed on: https://gerrit.libreoffice.org/8572 Change-Id: I20f92f52cc79df4fc5e10c4e4867e2e704ba3c86
2014-03-17fdo#75604: File Corruption - Issue related to the nested AlternateContent.YogeshBharate3-0/+12
Problem Description: - If the document contains, text box & group shape having text, after roundtrip file get corrupted. - Due this the text box exported inside the another group shape. (i.e nested alternateContent which is not allowed in MS office 2010.) Implementation: - Use the variable which avoid the nested alternateContent. - This keeps the various text frame on same level in different run. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8555 Change-Id: Ia18eb2b8cf17a451ebe344a811efae1328134215
2014-03-17FDO#76013 : If original file has image whose link is broken RT gets corrupted.umeshkadam3-4/+25
- The original file contains an image which has invalid link. - since the link is invalid the import throws an exception while loading the image & the link is lost. - while exporting the system used to write an empty image for an unhandled graphic type, which is incorrect and the RT file would result in corrupt. - Fixed this issue and added UT. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8549 Change-Id: If884f154d1fba921280d63930e7fccb979ea5608
2014-03-16WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'Tor Lillqvist1-1/+1
Change-Id: I44ea80e5e8e6bb568eb91c29a2adf73b110fb660
2014-03-16sal_Bool to bool + make a local function staticMatteo Casalin4-36/+36
Change-Id: I8285f69e175dd10f6128a1d9b39bdc646c51df43
2014-03-16SwapIn/SwapOut can return bool + sal_Bool to boolMatteo Casalin5-40/+46
Change-Id: Ia5477d6bb83af38435b9ac44359fe2f46b00807c
2014-03-16Fix indentation/formatting and 2 typos in a commentMatteo Casalin1-23/+30
Change-Id: I863f82fb9ddf136778ab5934312859dcac2370f9
2014-03-16sal_Bool to boolMatteo Casalin6-25/+25
Change-Id: I01986d22cfc6544cbad39c3276d272d0520e3f53
2014-03-16Remove redundant inlineMatteo Casalin1-12/+12
Change-Id: I1846523359104a00c4fb84dc0d4df4251e4c43b6
2014-03-16sal_Bool to boolMatteo Casalin12-91/+93
Change-Id: I5c134bce37e1be05618b14e7dbb22911cd6656c1