summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2014-05-21fdo#77725 make testcase minimalMiklos Vajna1-0/+0
Loading 54 pages to check a single footnote is a waste of time. Change-Id: Ic68d1d29e26e3d66973e5fca65c8958b953c78e0
2014-05-21fdo#78663 : Corrupt: 2007 WordArt whithin a Drawing toolRajashri6-8/+67
A file contains a 2007 word art within a drawing tool. In Original file, the xml structure is as below: sample xml: <p> <r> <ac> <drawing> <txbx> <txbxContent> .. <pict> </pict> </txbxContent></txbx> </drawing> </ac> </r> </p> LO was preserving this as : <p> <r> <ac> <drawing> <txbx> <txbxContent> .. <drawing> <txbx> <txbxContent> .. </txbxContent></txbx> </drawing> .. </txbxContent></txbx> </drawing> </ac> </r> </p> Now after this fix, If there is a custom shape within a text box, then we should postpone it and write it in a separate run. This approach is followed on the fact that LO writes nested TextBoxes in separate run. NOTE1 :Due to this fix, xpath related to the below UT needs to be updated. testFdo76249 in ooxmlsdrexport.cxx NOTE2: In docxsdrexport.cxx : 'm_bIsInDMLTextFrame' is no more required. For adding LockedCanvas, we only need to check if the property exists in the property set. Therefoew removing the above bool variable. Reviewed on: https://gerrit.libreoffice.org/9392 Change-Id: I00e94712e912ad1977fcb65a945fefb927795d77
2014-05-21unused DocxSdrExport::setDrawingOpen()Miklos Vajna2-6/+0
Change-Id: I8a5d36325edda8c475c4ad5874ec83c444bf2b50
2014-05-21fdo#78469 FileCorrupt:During export LO was adding wrong tags inside <w:sdtPr>Tushar Bende6-3/+41
Description : Docx file corrupt after roundtrip. Root cause: For some documents During export LO was not checking for the content of sdt and Even if sdt contains Drawing object LO was writing text data related tags <w:text/> & <w:dataBinding> in <w:sdtPr>,This was the reason for corruption. To Fix this checking is there is any Drawing Object in run if yes skip writing <w:dataBinding> tag in <w:sdtPr> And if sdt content is Text and Drawing both do not write <Text> or <Picture> as these tags will again result in corruption. Presently, while writing the sdtContent tag LO does not check for the content type due to which LO ends up adding the dataBinding along with the Drawing/AlternateContent which is incorrect according ecma ECMA-376, Second Edition, Part 1 : 17.5.2.6. This cause in file corruption. Added a check to restrict the aforementioned. Reviewed on: https://gerrit.libreoffice.org/9371 Change-Id: Id31437db0309b0a2159389a4a9a1f5e13c1ac3a5
2014-05-20Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part18Julien Nabet4-32/+31
Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225
2014-05-20loplugin:implicitboolconversion,literaltoboolconversionStephan Bergmann1-3/+3
Change-Id: Ib783fd0557361286ce7b913a429c9ab8fc101c75
2014-05-20Displaying the number of standardized pages in the Word count windowMichal Siedlaczek6-286/+474
The number of standardized pages (unit defined in the options) for the entire document and the selected area is displayed (if enabled in options) in the Word count window. The number of pages of size P for an area containing N characters equals P/N. This value is a float with one decimal place precision. The default size of the standardized page is 1800 characters (including whitespace characters). The configuration can be altered in Options->Writer->General. Conflicts: sw/source/ui/config/optload.cxx Change-Id: If13e87c73cb7706ff6618fa0352ba29c7c670aec Reviewed-on: https://gerrit.libreoffice.org/7642 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-20fdo#78658 Corruption: lockedCanvas tag is missing from RT fileDinesh Patil2-0/+9
While export, locked Canvas is missing and drawing is exported inside textbox. However a locked Canvas has to be exported inside a text-box and drawing should fall under locked Canvas for the RT file to work in MS Office 2010. Reviewed on: https://gerrit.libreoffice.org/9377 Change-Id: Iea2c411302b552db18527001cc4c6d0290085afe
2014-05-20enhance pass-by-ref plugin to detect large argumentsNoel Grandin2-8/+8
Detect arguments larger than 64 chars passed by value. Change-Id: I9b0ea9ccb99d115984a26eab67c9cf6afd5f6cae Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-05-20fdo#78659 make testcase minimalMiklos Vajna2-1/+1
Change-Id: I393b413528685276bffd35fb7fe5ce8c742314b7
2014-05-20fdo#78659:FIle geting corrupted after Roundtrip due to fieldchar.Ravindra Vidhate3-1/+10
In a hyperlink, the field with fieldchartype="end" is getting addeded eventhough there is no begin for that field. Change-Id: I50df6efc63fc9a66b146d4a861ae4bd654b4a3c6 Reviewed-on: https://gerrit.libreoffice.org/9368 Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-05-20fdo#78654 LO was exporting corrupt docx file.sushil_shinde3-0/+13
If docx file contains multiple hyperlinks in one paragraph and one of the hyperlink contains "PAGEREF" field. End tag for "PAGEREF" field was not exported hence it was causing corruption in exported file. Fixed export part of field end tags in case of "PAGEREF". Added unit test. Change-Id: I18a3625213bf7269e3f441859a27acc38cf6ff45 Reviewed-on: https://gerrit.libreoffice.org/9364 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-05-19-Werror,-Wunused-resultStephan Bergmann1-1/+1
Change-Id: Iaa06237d3e554d3a3d9c87f6c5dba715343afa25
2014-05-19resolved fdo#66620 keywords occur in unquoted context onlyEike Rathke1-12/+92
Change-Id: I4de41e5b66f1a856a786c521ca4ef2eec14c7499
2014-05-19WaE: -Wunused-variableThomas Arnhold1-3/+1
Change-Id: I821560e86a45ac53f4886bedd957e5d2dd30e3cd
2014-05-19WaE: -Wunused-variableThomas Arnhold1-3/+0
Change-Id: Ia35011b115ca9a6dbcc6f0a047d876d9ad132dcb
2014-05-19WaE: -Wunused-variableThomas Arnhold1-4/+0
Change-Id: Ia03ee551f3694a77f70325168998e4e02517e318
2014-05-19WaE: -Wunused-variableThomas Arnhold1-4/+0
Change-Id: I634c6412ed4be5611913887b5dd51837405e2250
2014-05-19hrc and src files: squeeze multiple newlinesThomas Arnhold30-74/+0
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
2014-05-19sw doc model xml dump: handle SwDoc::mpFrmFmtTblMiklos Vajna2-4/+32
Change-Id: Ie15ff20524e7065323e681945bb5eaf199a2bf3a
2014-05-19valgrind: memory leakCaolán McNamara1-0/+2
Change-Id: I4cd6f99151348c97a116cd86cc5da9f4f6e68d9d
2014-05-19SwVirtFlyDrawObj: suppress unused parameter warnings (it's used by assert)Michael Stahl1-0/+1
Change-Id: I2f5b530e011bf1bb95ca5e0421f6e03c0885872a
2014-05-19fdo#78149: assert if SwVirtFlyDrawObj is being painted with no ViewPort setMichael Stahl2-4/+9
Change-Id: I2f94a28d85fa31c5623ff0c6067edc7060998d9e
2014-05-19fdo78474:Corruption a:graphicData has no info for the image.Sourav2-0/+12
The original file contains two text boxes one contains image and the other contains chart. Image in text box is not getting imported in LO which leads to no contents inside the a:graphicData tag which is causing the corruption. Root cause is found in ShapeContextHandler::getShape. mxChartShapeContext.is() returns true even when mnStartToken is not set as NMSP_dmlChart which is causing the issue. I have added one more condition to handle this. Change-Id: I6c567d7618b34c1a24f6809801e4460af6894c67 Reviewed-on: https://gerrit.libreoffice.org/9363 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-05-18fdo#46839 Convert line color picker to split buttonMaxim Monastirsky6-6/+6
Change-Id: I4987cc9ffba675009f2d2ae9f6b12ed4ee02fe13
2014-05-18fdo#78651 DOCX Incorrect export of nested TablesVinaya Mandke4-0/+18
As the m_oldTableReference->m_pOldTablepInner was not cleared the same tabled was incorrectly nested with itself. Another issue was that the same table was mirrored in RT file as LO was trying to export a Section break within a table cell. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewe on: https://gerrit.libreoffice.org/9361 Change-Id: I09b730a10f1a0bc4434050e0078aeab3185de817
2014-05-17Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part15Julien Nabet23-146/+145
Change-Id: I38e855966598342eb2352e70e04f7a5e09e54f83
2014-05-17SwFmtCol: rename member variables missing their prefixesMiklos Vajna2-113/+113
Change-Id: I0cf0b585a9cfcbb119c68adf51dc786bc6373e2e
2014-05-17Correct common misspellings, and remove some ASCII art along the way.Chris Laplante13-15/+15
Change-Id: I42787db31769e8bde984c5f4f0aa90335e889b1c Reviewed-on: https://gerrit.libreoffice.org/9356 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
2014-05-17sw: try to fix a valgrind warningMichael Stahl1-0/+2
Invalid read of size 1 at SwParaPortion::SetPrep(bool) (porlay.hxx:299) by SwTxtFrm::Prepare(PrepareHint, void const*, bool) (txtfrm.cxx:1756) by SwTxtFrm::Prepare(PrepareHint, void const*, bool) (txtfrm.cxx:1663) by SwCntntFrm::MakeAll() (calcmove.cxx:1310) by SwFrm::OptPrepareMake() (calcmove.cxx:356) by SwFrm::OptCalc() const (frame.hxx:1037) by SwLayAction::_FormatCntnt(SwCntntFrm const*, SwPageFrm const*) (layact.cxx:1829) by SwLayAction::FormatCntnt(SwPageFrm const*) (layact.cxx:1660) by SwLayAction::InternalAction() (layact.cxx:597) by SwLayAction::Action() (layact.cxx:376) by SwLayIdle::SwLayIdle(SwRootFrm*, SwViewImp*) (layact.cxx:2179) Address 0x1f9507e0 is 832 bytes inside a block of size 840 free'd by FixedMemPool::Free(void*) (mempool.cxx:48) by SwParaPortion::operator delete(void*, unsigned long) (in /work/lo/master/instdir/program/libswlo.so) by SwParaPortion::~SwParaPortion() (porlay.cxx:1972) by SwTxtFrm::ClearPara() (txtcache.cxx:102) by SwTxtFrm::Init() (txtfrm.cxx:329) by SwTxtFrm::CalcLineSpace() (txtfrm.cxx:746) by SwTxtFrm::Prepare(PrepareHint, void const*, bool) (txtfrm.cxx:1680) by SwTxtFrm::Prepare(PrepareHint, void const*, bool) (txtfrm.cxx:1663) by SwCntntFrm::MakeAll() (calcmove.cxx:1310) by SwFrm::OptPrepareMake() (calcmove.cxx:356) by SwFrm::OptCalc() const (frame.hxx:1037) by SwLayAction::_FormatCntnt(SwCntntFrm const*, SwPageFrm const*) (layact.cxx:1829) by SwLayAction::FormatCntnt(SwPageFrm const*) (layact.cxx:1660) by SwLayAction::InternalAction() (layact.cxx:597) by SwLayAction::Action() (layact.cxx:376) by SwLayIdle::SwLayIdle(SwRootFrm*, SwViewImp*) (layact.cxx:2179) Change-Id: I64a1cc6ea301b653af951ba0e00e28d4655d2d97
2014-05-16coverity#704866 Unchecked dynamic_castMiklos Vajna1-1/+2
Change-Id: Ib1108a6641635bbbb0d88968754d7bb19a8c9e73
2014-05-16sw: fix indentation in rtf{export,import} testMiklos Vajna2-58/+53
Change-Id: Ie777de47dc70da136b145028a08ea17a0de7a87d
2014-05-16coverity#708868 Unused pointer valueCaolán McNamara1-1/+1
Change-Id: I5d25f7de37df6fe79bb195e1cb68876fb3b4fcca
2014-05-16coverity#708847 Unused pointer valueCaolán McNamara1-2/+0
Change-Id: Id16ebc576834e418a3bf2d3d6eb3e2545e0aac2b
2014-05-16DOCX import: make sure inline shapes are not in the backgroundMiklos Vajna2-0/+6
Change-Id: I80d684662ac3f94bff4448fcdae94f9e69fd1590
2014-05-16sw doc model dump: show SdrObject::nOrdNumMiklos Vajna1-0/+1
Change-Id: I4ac2c3d883dd9bb111a2d600f5a17ea96a1e219e
2014-05-16ooxml: Preserve effects on picturesJacobo Aragunde Pérez4-5/+62
If a picture contains some 2D (glow, shadow...) or 3D effect (rotation, extrusion...), we prevent the importer from transforming it into a XTextContent so the XShape grab bag is not removed and the effects are preserved using the existing mechanisms. Added a unit test for this issue, and modified some existing unit tests to match the new behaviour. Change-Id: I3b87069ea208604383a592d34d0a4ceb6b0f9fc7
2014-05-16ooxml: Preserve shape effects when there's more than oneJacobo Aragunde Pérez2-0/+29
Transformed the preservation process of shape effects to be able to store more than one effect. For that we: * Created the Effect struct and added a vector member to the EffectProperties struct. * Changed the shadow effect to use the new Effect struct, EffectShadowProperties struct is preserved because the direction field still has some use but we should remove it. * Changed the structure of the grab bag to store more than one effect. * Modified an existing unit test to check shapes with several effects. Change-Id: I0dd908fa1d9578827c02ef6272fc9e2b914391be
2014-05-16fdo#78432 : DOCX: File gets corrupt after RoundTripPallavi Jadhav3-2/+60
Issue : - In RT in document.xml, value of Absolute Position Offset <wp:posOffset> was going out of bounds. - <wp:posOffset> is of type Int(32-bits), hence it's value should not cross the MAX and MIN limits of Int. Implementation : - Added check for <wp:posOffset> should not cross Maximum/Minimum limit of Int. - Written Export Unit test case. Reviewed on: https://gerrit.libreoffice.org/9328 Change-Id: I22e75d7e603ebbf6a49e764fb1a3e6a4d2fd8b23
2014-05-15fdo#55582 Writer: Dont overwrite from even when selected, from writer.Lennard Wasserthal1-2/+6
This patch fixes the writer part, calc part is fixed long ago. Problem: it overwrites when you paste from impress or calc. This allows to keep the graphic's frame, so the text doesn't have to be rearranged. (i.e. it is desired, so I didn't change that) I was trying to give the user a choice, but I didn't succeed in keeping the frame when pasting from writer to writer. coming soon! Change-Id: I07271df9bb501779d06f332bb13edd05f0aefacb Signed-off-by: Lennard Wasserthal <Wasserthal@nefkom.net>
2014-05-15sw html test: missed one class name at renamingTomaž Vajngerl1-1/+1
Change-Id: I614bbda7b796a4bd57d9511a9dc68beafa398b38
2014-05-15sw test: HtmlExportTest - assert pDoc exists, rename classTomaž Vajngerl1-15/+13
Change-Id: I5e17b8636236c2a0f78df80c36d82a3ba16a1c5f
2014-05-15sw test: unify names of local variables and move to them to topTomaž Vajngerl3-50/+55
Change-Id: Iaba274f73edf4ff49d06f5dd15ab8ab2ddd043f7
2014-05-15sw test: user parent's parseXmlStream methodTomaž Vajngerl1-6/+1
Change-Id: I6b50172b636cd8334b5cbfd3986631c1f17dd366
2014-05-15DOCX import: fix chart size when it's inside a TextFrameMiklos Vajna2-0/+10
Change-Id: I3edb253238db182054b7688061916a2432b687b5
2014-05-15Resolves fdo#70681: fixincludeguards.pl: all that's leftThomas Arnhold1-2/+2
Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5 Reviewed-on: https://gerrit.libreoffice.org/9360 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-05-15Resolves: fdo#78204 adjust note icons on comments-in-margins caseCaolán McNamara3-22/+106
the page has been scaled by 75% and vertically centered so the page positions need to be also adjusted. Change-Id: I7ab6b4956933ba444441c857e78aee8e5c1cf97a
2014-05-15coverity#705490 Dereference null return valueCaolán McNamara1-2/+3
Change-Id: Iac4178e7f751cba0b4a135dc9d840234d96ccfa2
2014-05-15coverity#705484 Dereference null return valueCaolán McNamara1-1/+1
Change-Id: I8ba236e64994c6e37e1a782cc911df57cb902f86
2014-05-15coverity#705482 Dereference null return valueCaolán McNamara1-2/+4
Change-Id: Id50d79c2dddc3105821703fb9773128c0cc6f2f3
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 18:30:56 +0000