summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2014-08-19DOCX export: handle SDT around floating tablesMiklos Vajna
Change-Id: I07fedc201c51008baca3254dcc099f0182aa4c72
2014-08-19DOCX export: handle multi-para SDT's ending right before a tableMiklos Vajna
Change-Id: I47ea5fd6e1b4d9d5a2893112efdcd810c4c84cfb
2014-08-18Typo: loop on all Marks instead of processing Mark(0) over and overMatteo Casalin
See: http://nabble.documentfoundation.org/Suspicious-loop-any-idea-td4119239.html Since the code was like this since initial import (2000), if this patch proves to be wrong then the other option could be to just don't loop and process Mark(0) just once. Change-Id: I41ac18604e916740dcc68bf69af37529842f774d
2014-08-18Consistency around XColorItem in svx/sdshcitm.hxxStephan Bergmann
...similar to what has been done for svx/sdtmfitm.hxx in 6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: I7ecf827a0713efaecb4b0eb49f9f8c06f8c59091
2014-08-18DOCX export: don't forget to close SDT elements inside the TextBoxes of shapesMiklos Vajna
A usual problem with SDT is that in case it should end after the last paragrah of a container, there is no "next" paragraph that could have the relevant "EndSdtBefore" property. This is usually handled by closing the SDT tag before the container is closed. The problem here was that DocxAttributeOutput::WriteSdtBlock() did not notify DocxSdrExport about opening the SDT, as it thought there is no draw export in progress. This is because in case of "shape with a TextBox", the common writeDMLAndVMLDrawing() method is not called, instead the separate writeDMLTextFrame() and writeVMLTextFrame() methods are invoked. Fix the problem by adjusting these methods to writeDMLAndVMLDrawing(), so that they also set m_bDMLAndVMLDrawingOpen to true during the TextBox export. Change-Id: Ie08b0b955cd2d6a645970da3d485e447abfd6495
2014-08-18Consistency around SdrOnOffItem in svx/sdtcfitm.hxxStephan Bergmann
...similar to what has been done for svx/sdtmfitm.hxx in 6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: Ib461b5d3702e00a9d7cef3229c44e3328c776e1d
2014-08-18drop unnecessary shl.hxx includesCaolán McNamara
Change-Id: Ieb984987c4a4f888a563377e0500444b12f43506
2014-08-18Change inline-edit mouse input handlingJan-Marek Glogowski
This changes the mouse click handler for input fields to the following logic: * If the cursor isn't already in the input field: * On mouse over displays the POINTER_REFHAND * A left click selects the whole text of the field and therefore moves the cursor to the end of the field * Same for the right click. Additionally it opens the popup menu * If the cursor is already in the input field: * As for normal text, the left click removes the selection and moves the cursor to the click location. * Right click keeps any selection and opens the popup In contrast to normal text editing, a double click still opens "Edit fields" dialog, instead of the word selection. Change-Id: Ie7a50b34fe625358426d18eaec2e833f36702528 Reviewed-on: https://gerrit.libreoffice.org/10836 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-18fdo#82492 : DOCX: Corruption: File was getting corrupt fafter RTPallavi Jadhav
Issue : - In issue file there were two runs(first run=SDT, second run=Shape). - These two runs were consecutive(no text/space/tab was there in between two runs). - Due to such scenario, "SdtEndBefore" was not getting set on Shape. - Hence at Export EndSdtBlock() was getting called from EndParagraph(). Due to this SDT was not getting end after first run. In order to end SDT after run, EndSdtBlock() should get called from EndRun() (as in Original file) Implementation : - Set "SdtEndBefore" on Shape in DomainMapper_Impl::PushShapeContext() - Retrieved same property at export. - Added export unit test case. Note : Added common functions at Import and Export with reference to https://gerrit.libreoffice.org/#/c/10827/ Conflicts: sw/source/filter/ww8/docxattributeoutput.cxx Reviewed on: https://gerrit.libreoffice.org/10912 Change-Id: I357d77cd179c83b8ae976db331ee46c8993b6cb8
2014-08-18DOCX filter: improve qFormat export handlingMiklos Vajna
The old rule was: write qFormat for everything that's not a custom style. The new rule: write qFormat for everything that's a custom style + have a whitelist of non-custom, but qFormat styles. This matches better what Word does (whitelist is from the latent style section of an empty document, created by Word). Change-Id: Ie7a0802e886c41b8d26ca9aa154913aa2f3ff87a
2014-08-18Fix missing prefixMiklos Vajna
Change-Id: I0a9df00f90b63059e6446278d7a98d1cd902de4b
2014-08-18Consistency around SdrMetricItem in svx/sdsxyitm.hxxStephan Bergmann
...similar to what has been done for svx/sdtmfitm.hxx in 6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and 68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem." Change-Id: I3734cb14b6ed8f556af85b234968682a55ac8a4c
2014-08-18Test compiling before committing is overratedTor Lillqvist
Change-Id: I65e4a6ad59aee21b62454b4fcdd6d6ca056cb249
2014-08-18include app.hrcThomas Arnhold
Change-Id: Ib0db01179ed56f39d5e3986e7302b2bf914b06e9
2014-08-18fix buildThomas Arnhold
apparently I removed the wrong one with 15344d0415f153ba579ad132266c47990a8c9515 with pch I don't see those problems :( Change-Id: If4cb8b178bdd8f8d68b4921c1993642656fc75ea
2014-08-18fix string resourceThomas Arnhold
Change-Id: I96861e0d31c75587892d13818f536acb1a05d24e
2014-08-18fix buildThomas Arnhold
Change-Id: I9db0befd075089f346b504f91657a67dc01c9808
2014-08-18InfoBox to String finalThomas Arnhold
Change-Id: I42f97a12052f4a173b05173fdd2c3079c517f78e
2014-08-18InfoBox REG_WRONG_PASSWORD and REG_WRONG_PASSWD_REPEAT to StringThomas Arnhold
Change-Id: I64d2b73744401baafd7dd037187ba3d7c604a535
2014-08-18move strings to global fileThomas Arnhold
Change-Id: I6e1b54a66d0b669ecbba4eb305c1dd8925747edd
2014-08-18InfoBox MSG_WRONG_TABLENAME and MSG_ERR_TABLE_MERGE to StringThomas Arnhold
Change-Id: I36fc0ed4f67c0af467a8dc593950a9c53a5ec53b
2014-08-18InfoBox STR_SRTERR to StringThomas Arnhold
Change-Id: Ic3b7de3d26e91b260d775e629602758f63a40b85
2014-08-18InfoBox MSG_DOUBLE_SHORTNAME and MSG_NO_GLOSSARIES to StringThomas Arnhold
Change-Id: Ie3934ebc3209b8ba0358cca5fad9883e3b8cd262
2014-08-18InfoBox MSG_ERR_INSERT_GLOS to StringThomas Arnhold
Change-Id: Ie72cb6796e3996d7050b771f7ab92e4ab5a6d72b
2014-08-18InfoBox MSG_ILLEGAL_PAGENUM to StringThomas Arnhold
Change-Id: Idef182a43e7aa631aeea92870e3c51a7c2b8b7c5
2014-08-18InfoBoxes to StringThomas Arnhold
Change-Id: Iccaf0cd1adbe5a2b1ff81c466ca3c81c00390c10
2014-08-18InfoBox MSG_ERROR_PASSWD to StringThomas Arnhold
Change-Id: I88a34ad1d54066c30523c6493cbe5f0502adb3fb
2014-08-17Fix input field tab handlingJan-Marek Glogowski
When searching for the current field in the field list to find the previous or next one, we check the field start and compare it with the cursor position. But with the new input fields, the cursor can actually be anywhere in the field, so we actually have to search for the start position of the input field at the cursor position. Change-Id: I26526524eccfdbea41c6bf69a460fa64248f50ca Reviewed-on: https://gerrit.libreoffice.org/10837 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-17fdo#76565 Allow pasting into input fieldsJan-Marek Glogowski
Change-Id: If996284aeea4b430cceaaf264035aa9e4ec0f2f0 Reviewed-on: https://gerrit.libreoffice.org/10835 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-17fdo#81750 MM: correctly convert inline-edit fieldsJan-Marek Glogowski
The new inline-editable input fields contain real content in the node, therefore a single SwPaM::Move isn't sufficient to select the field or move after the field. For the input fields we can directly go to the end of the field. Change-Id: Ic1bce415ce45e49456121b6db003ded0733e195c Reviewed-on: https://gerrit.libreoffice.org/10834 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-17Input fields are always editable...Jan-Marek Glogowski
if the document isn't read-only. So backspace should always work in input fields. Regression from 961315f0838197e71e9bd49169afe673466e5eb8. Change-Id: I06648ab075b198ee7914e7ae60bef87e7ff94f0a Reviewed-on: https://gerrit.libreoffice.org/10833 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-17fix reading even/odd page breaks from .docx (bnc#519228)Luboš Luňák
We map Word's even/odd page breaks to Writer's left/right page styles. And we cannot just set any page style to be left/right, because that could set e.g. the default page style as such, which would make all normal pages that way. So instead we need to make a copy of the relevant page style, as the original page style as its follow, copy all the properties and headers/footers, and use this copy to get the page break. Change-Id: Id0d2568de91ac2de4afb0ba3a6eedd9cec46f878
2014-08-17fix reading a .doc that has frame anchored to the end of page (bnc#787942)Luboš Luňák
MSWord, unlike Writer, can anchor even to a page break (i.e. after the last paragraph). When this document was read, what happended was: - the last paragraph was read and the current position PaM was set to point after it - frame was read and anchored to the PaM - page break was read, making everything following be moved to the next page; including whatever ended up at the PaM position Handle this by checking for this case and inserting an extra empty paragraph before the break. This shouldn't affect layout of the page itself anyway, since the break should leave room for it (and MSWord shows a page break there if control characters are enabled, so there is room). Change-Id: Ia2a13bf5cf1c959b5aa228254365019a00a22679
2014-08-17coverity#1158079 Unchecked dynamic_castCaolán McNamara
Change-Id: Iab2c78af7dcf967ccdf5016266324c805856af0b
2014-08-17Hyperlink dialog: Don't close if it's already openThomas Arnhold
Steps to reproduce: 1) Writer. Insert -> Hyperlink. Leave the dialog open. 2) Click into the writer document and type a link "http://google.de/", this will get converted to a hyperlink. 3) Now right-click on the hyperlink and choose "Edit Hyperlink" from the context menu. The Hyperlink dialog will close. The Hyperlink dialog should stay open and not close, if you want to edit the hyperlink. This commit fixes this. Change-Id: I125c12733790632008cad1a9fc2d13bf16487381
2014-08-17remove executable bitsThomas Arnhold
Change-Id: Iec785ae538de81325812b1e6fe33115789b39770
2014-08-17oupsThomas Arnhold
wrongly deleted in 0842a2707cfca15c0af5eee6ed9d76547a01a7f9 Change-Id: Iafccce9a503c48e483d492a2d4bdee9a648f32c7
2014-08-17warning C4800: 'int' : forcing value to bool 'true' or 'false'Thomas Arnhold
Change-Id: I810e2b963f02c67d10765444cae2b5ec846af746
2014-08-17warning C4800: 'int' : forcing value to bool 'true' or 'false'Thomas Arnhold
Change-Id: Iae7dd3944d1d01020c8a3ab1ac4bb2e94e01541e
2014-08-17use bool directlyThomas Arnhold
Change-Id: I314e290b453c55e345559d8abef9b00622493ed3
2014-08-16Related: fdo#45588 Use of different items for Formatting MarksJulien Nabet
There's still help part to change See https://bugs.freedesktop.org/show_bug.cgi?id=45588#c9 Change-Id: Ieb69ebffc680b0352ed481524a95a78bca50ac83
2014-08-16Missing ; (unsuccessful merge)Matteo Casalin
Change-Id: I3a1ab8936021e0b310afa799b1c257040bf78be3
2014-08-16Consistently use size_t and SAL_MAX_SIZEMatteo Casalin
Change-Id: Ibab89984ec94556ec368653b6db50c6c2e380dec
2014-08-16Avoid redundant cehck and unneeded local scopeMatteo Casalin
Change-Id: Ifd8359f709a3c11851673921f278b3055ea518c6
2014-08-16Consistently use size_t and SAL_MAX_SIZEMatteo Casalin
Instead of a mix of sal_uIntPtr, sal_uLong, int, and so on. Also change CONTAINER_ENTRY_NOTFOUND=ULONG_MAX to SAL_MAX_SIZE as return value in case of failure and in the related tests. Change-Id: Ie778a849253b4be84fbcdab9557b7c4240233927
2014-08-16sal_uInt16 to size_t, avoid temporaries and hardcoded constantsMatteo Casalin
Change-Id: I21bd116ec39ba865a881a5866d4227b094d3a249
2014-08-16Fix indentation/formatMatteo Casalin
Change-Id: Ic1dbc6ba261da23be2a0a6f715cd79e68b168c6c
2014-08-16Use more proper integer types, avoid temporaries and constifyMatteo Casalin
Change-Id: Ia2b591641ab7c954f3b1c7d5f58b42927d974a58
2014-08-16Fix indentation/formatMatteo Casalin
Change-Id: I8544a1a84f4812cdfae6a6aa5db7ea5576c956c2
2014-08-16sal_uInt16 to sal_uInt16, constifyMatteo Casalin
Change-Id: Iabb5662cfe135728ca77244032a93762cd7e1c93
generated by cgit (git 2.34.1) at 2024-08-11 07:12:44 +0000