summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2014-06-24Fix some warningsMatúš Kukan
Change-Id: Ib661af2ab2ad2e95890edb1edf979a82e67a9443
2014-06-23SwDrawView::DeleteMarked: delete textbox of shape as wellMiklos Vajna
If we delete a shape that had a textbox, then delete that textbox as well. Without that, the doc model would be still consistent, but most probably would not be what the user expects. Change-Id: Id5075233ce66d7a398c88ff3e63b05a6b2133571
2014-06-23fdo#76260 - a better approach for getting element names.Michael Meeks
Don't do lots more work than we need to to build the list of names. It appears that the [] operator does a lot of apparently un-necessary work. Change-Id: Id603fb4e717dc7130468465493edccfe51d384c7
2014-06-23fdo#76260 - the wrong way to get a 10% win with an N^3 operation.Michael Meeks
Micro optimising the inner-loop is never the right way; on the other hand this is 10% of load time and is waste. Change-Id: Ie275be53e30834cbb6576b8e7580c16d2e47bf16
2014-06-23dangling TableNameEditsCaolán McNamara
Change-Id: I261540e6d80440dede7d185717c776a8ab6a22cb
2014-06-23SwContentType::FillMemberList: ignore TextFrames which are used as TextBoxesMiklos Vajna
SwDoc could already filter them out, but not SwFEShell. This makes them not shown in the Navigator window. Change-Id: I343ab005513198c30970bfdec4e871fbccdebc01
2014-06-23fdo#76203 - use consistent titlecase for UI title labelsJoren De Cuyper
Change-Id: Icae67c083ca867c89cff7f9d5d44dbbe4aadcba9 Reviewed-on: https://gerrit.libreoffice.org/9858 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-22CppunitTest_sw_ooxmlexport: enable a subset of these tests on WindowsMiklos Vajna
Change-Id: Ia9bb5f9ea7854e7f85abd8bad347db82b342177f
2014-06-22Fix pathsJulien Nabet
Change-Id: Idc756bc1b224952b9283fd15b3313b70ea3828a3
2014-06-22sw: Fix SID_CHAR_DLG_EFFECT behaviorMaxim Monastirsky
A regression from commit f41e7c70. The wrong tab is opened (used in the sidebar underline popup). The correct id is "fonteffects" not "fonteffect". Change-Id: Ic06fb3f93a033bcfe24b97eb124ceea082b4087f
2014-06-22sw: Fix method name in messageMaxim Monastirsky
Change-Id: I91324359ac69737bfdd19ee80379b8109cd127dd
2014-06-21Avoid possible memory leaks in case of exceptionsTakeshi Abe
Change-Id: I27a0c3639c346720df471ffa3940783565c47f7d
2014-06-20SwDrawContact: recaclc textbox size on shape adjustment change as wellMiklos Vajna
Change-Id: I65abec66d56f2bf83e28c85589638cea5f3a7a0c
2014-06-20sw: clean up leftover TextBox TODOsMiklos Vajna
Change-Id: I12782690368789849ea2ce2ed08ad4838a0a55db
2014-06-20SwDrawContact::Changed: sync position/size between draw shape and its textboxMiklos Vajna
This takes care of moving / resizing the textbox when the draw shape has been resized. Change-Id: If4c6f0bcdd03e00e3e49b0d30de3e1d0595977d4
2014-06-20fdo#79973 : LO crashes while opening the document.PriyankaGaikwad
Description: - If the equation ends with two dots(.) then file get crash. - In SmParser::NextToken() the file get crash because string index is out of bound. Change-Id: I5f25814220d556d53c10d4ca33a38b4d0d451438 Reviewed-on: https://gerrit.libreoffice.org/9840 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Tested-by: Muthu Subramanian K <muthusuba@gmail.com>
2014-06-20CppunitTest_sw_ooxmlsdrexport: this define should no longer be necessaryMiklos Vajna
Change-Id: I5e4540b5bf47dde53021a300118052da47b90eff
2014-06-20RTF import: handle column break at the very start of the documentMiklos Vajna
Change-Id: Ib7d166bf1b1e5d5216d822b2b0396aa4dc535c6f
2014-06-20CppunitTest_sw_ooxmlsdrexport: clean up testFDO77122Miklos Vajna
The document contained a few unrelated shapes and it was reported that those cause testcase failures, depending on the version of some system libraries (at least Ubuntu 14.04 is reported to be affected). Change-Id: I1aaf02441e2bc30d1a5465b038211deb240a5b69
2014-06-20fdo#78904 : LO hangs while saving the document.Umesh Kadam
- In case of framePr attributes being omitted in original xml, LO defaults such attributes to incorrect values. - Correcting these values in this fix. - This fix stops LO from getting hang while saving the document, the actual fix needs to be somewhere in the table layout. We need to restrict the frame from being considered as part of the table as MSO does not allow frame to be part of a table. Change-Id: I4c35f7eff6ca1122901f5667fc26b849df527f60 Reviewed-on: https://gerrit.libreoffice.org/9774 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-20fdo#79968: & fdo#79969: Fix for embedded powerpoint & excel sheet in docx.Yogesh Bharate
Problem Description: fdo#79968: 1. Document contains embedded powerpoint in docx. 2. After RT, embedded powerpoint object is not preserved. 3. In this case, .sldx is get converted to .bin due to this powerpoint slides is getting converted to picture. fdo#79969: 1. Document contains embedded excel work sheet. 2. After RT, embedded excel sheet is not preserved. 3. In this case, .xlsm is get converted to .xls. 4. Similar case happened with binary excel work sheet. Implementation: Added sMediaType, sRelationType & sFileExtension for embedded excel sheet, binary excel sheet & powerpoint slide. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/9765 Change-Id: I8f94e3f9293f2ac98b61f919d60ca556695b26c2
2014-06-20fdo#79591 Values for docPr name and shape ID attributes were set invalidDinesh Patil
Values set for docPr name and shape ID attributes in RT file were not valid as per UTF-8 encoding format and hence was showing RT document as corrupt with error message "invalid character". Calling add() function with current parameters is causing issue and setting invalid values so modified the second parameter which will set valid values to the specified parameters. Reviewed on: https://gerrit.libreoffice.org/9746 Change-Id: I3b48e53adbe5ed844235e596bb98eb396133845a
2014-06-20Avoid possible memory leaks in case of exceptionsTakeshi Abe
Change-Id: Ic9b9c22c0ad15bfefce729e7277f950cb66d9bf6
2014-06-19fdo#79599: use \highlightN instead of \chcbpatN in RTF import and exportnrbrtx@gmail.com
Reviewed on: https://gerrit.libreoffice.org/9776 Change-Id: I98ef606fb73368a3c275819cb83b936e2162769d
2014-06-19fdo#71076, fdo#71767: Preserve number formats when charts are copied.Kohei Yoshida
Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a
2014-06-19fdo#71558: Notify mispelled word to accessibilityJacobo Aragunde Pérez
This patch modifies the spell checking code to trigger an invalidation of the accessible paragraph attributes when a mistake is detected, so the 'text-attributes-changed' event is released. Notice that 'text-spelling' is not an actual attribute of the text for LibreOffice, that's why this didn't work in first place. Finally, notice too that when the user disables the automatic spell checking, no 'text-attributes-changed' event is released, and when it is enabled again it will only release 'text-attributes-changed' events in case some of the newly typed text is misspelled. Change-Id: Ie792f040d84010cadcd41486d948a5e29421228f
2014-06-19abi#2720 RTF import: handle non-graphic object after a graphic oneMiklos Vajna
Change-Id: I9416b6e7cf3677006215fcbde458ed341c4e3e9e
2014-06-19Do not call SwASC_AttrIter::NextPos when nAktSwPos is already SAL_MAX_INT32Stephan Bergmann
...and calculating nAktSwPos + 1 would overflow. Reported by CppunitTest_sw_odfexport under -sanitize=undefined. Change-Id: I78bd540851192a768400ce348b42228f9cb10b72
2014-06-19SwDoc::SetFlyFrmAttr: sync position between draw shape and its textboxMiklos Vajna
The effect of this is that if you move around a shape (having a textbox) with the keyboard or mouse, then the position of the textbox is now also adjusted as you would expect it, as a user. Change-Id: Ie079f8c7b76e9a97095e4233eded5bda514cf405
2014-06-19loplugin:literaltoboolconversionStephan Bergmann
Change-Id: Ie21ec9cbdf88bd009368c09e49b9956cd001a5d3
2014-06-19Missing link depsStephan Bergmann
Change-Id: I6a96ffd9ab9b5deaed00cc857af30cd9d827d3c2
2014-06-19ToxLinkProcessorTest needs SwGlobals::ensure to set pSwResMgrStephan Bergmann
...derefernced in (anonymous namespace)::lcl_NewUINameArray SwStyleNameMapper::GetChrFmtUINameArray SwStyleNameMapper::getNameFromId SwStyleNameMapper::fillNameFromId SwStyleNameMapper::FillUIName SwFmtINetFmt::SwFmtINetFmt sw::ToxLinkProcessor::ClosedLink::ClosedLink sw::ToxLinkProcessor::CloseLink ToxLinkProcessorTest::ExceptionIsThrownIfTooManyLinksAreClosed ... Also, fix the name from sw_tox_test to sw_tox. Change-Id: I48ea9fb6322df3725b089538fd67b2e24578b668
2014-06-19fdo#78590: Fix for Corruption of para with framePr & drawing object into paraRohit Deshmukh
Issue: - File contains paragraph with framePr have graphic object in it. - So Libreoffice converts framePr into textbox. - So after saving file textbox gets exported with drawing object. - MS office does not allowed drawing object inside tetxbox. Change-Id: I673e0e9f6681a189bde1c63a8cb7aea2cac0ab41 Fix: - Export framePr into paragraph and igonre exporting of dummy textbox added by LO for framePr. Reviewed-on: https://gerrit.libreoffice.org/9389 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-19sw: add UI for removing the textbox of a draw shapeMiklos Vajna
Change-Id: Ib95573228d3dc98c88cd4af19995c99433c84ae6
2014-06-19sw: add UI for adding a textbox for a draw shapeMiklos Vajna
Change-Id: Icc4ff083431635f1769dba5907f26e7dc6b08d02
2014-06-19coverity#707363 Uncaught exceptionCaolán McNamara
Change-Id: I0c61a0176bb108e8e42c56e6cdbfa342ffe2512f
2014-06-19coverity#705037 Unchecked dynamic_castCaolán McNamara
Change-Id: I9f6c8ceafd09b4a5d4e951e01e1a06b2b5265181
2014-06-19coverity#706103 Unintended sign extensionCaolán McNamara
Change-Id: Icc0161f80982a9cab5776981a4848ea48709ecd2
2014-06-19indentation fixesMiklos Vajna
Change-Id: Ia391ccc9889a135730f0fead11eb0b6c2f748ec4
2014-06-19Prevent null pointer dereferenceStephan Bergmann
(even though the null pointer dereference in SwSection::GetBaseLink would be somewhat harmless in this case, as the result is here immediately turned into a pointer again; but it also does not look like LinkManager::Remove is designed to be called with a null pointer argument) Change-Id: Ia1560b03be6a654c1207c146c873f29788b68558
2014-06-18Resolves: #i125071# check SwFmt::GetItemState()'s ppItem parameter...Herbert Dürr
for NULL before assigning something into it. The ppItem default value is NULL so it is allowed. The method should be prepared to handle that. (cherry picked from commit 7d096ff2e25e422f55c821ecce99cecac6ee4b95) Conflicts: sw/source/core/attr/format.cxx Change-Id: I5b4bc84cf10f6f2955af21ae80a43e985f0555fb
2014-06-18error: expected ‘,’ or ‘;’ before ‘ppItemSets’Miklos Vajna
Change-Id: I8b88fea1f3634ccb1fef27e6802e67d2463b85a9
2014-06-18coverity#706098 Unintended sign extensionCaolán McNamara
Change-Id: Iccc81722785a269dc490270dab6ec42eebf9144d
2014-06-18coverity#736901 Unintended sign extensionCaolán McNamara
Change-Id: I655578db78ee8db6f4aa83aec944c074eab92ff3
2014-06-18coverity#736903 Unintended sign extensionCaolán McNamara
Change-Id: I66c8953bb482126f0862ea4351c3c0348a3cfd5e
2014-06-18coverity#983448 Unintended sign extensionCaolán McNamara
Change-Id: I8526d2e6ebee0c1400dd37a4949544db6c7bffe9
2014-06-18coverity#1213345 Unintended sign extensionCaolán McNamara
Change-Id: I1a47bb6583c4e853e5482009bfa659d33f865490
2014-06-18oox: import WPS shape with text as shape with textboxMiklos Vajna
This allows having real shapes (like having rounded corners) and complex content (like containing a table) at the same time. WPS shapes are wrappers around drawingML markup in DOCX files, so this only affects the DOCX import. Change-Id: Iad1c1c61233be1c17efa1821e680927aa9587215
2014-06-18chart2, sw: remaining textbox DOCX import test preparationsMiklos Vajna
Ideally now all testcases handle both cases during DOCX import: - current situation, when shape with text is imported as a Writer TextFrame - future situation, when shape with text will be imported as shape with an assicated TextBox Change-Id: I5b95ff4672cecf39eb744f8557f967ade73404c0
2014-06-18DocxSdrExport::writeDMLAndVMLDrawing: fix handling of inline VML shapesMiklos Vajna
In general Writer supports having objects inside a TextFrame, Word does not. It turns out that Word allows having certain shapes inside other shapes, as long as they are VML-only. So do that for now: if we receive a shape when we're already inside a shape, then just export it as VML, not the usual drawingml+VML pair. Also, blacklist one more VML shape type, where the shape text is already exported inside <v:textpath>, so no dedicated <v:textbox> is needed. Change-Id: I5786bd6827eae9756e7c179bb2ef5a5741a91878