summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2014-12-04Only call super-expensive Invalidate on scrollbar togglingCaolán McNamara1-2/+2
otherwise even using backspace in an annotated area will cause super slow behaviour as each keystroke causes a full page render This became a problem after commit 0761f81643a6890457e9ef7d913ab5c88c2593a4 Date: Thu Dec 19 18:50:58 2013 +0000 123792: complete annotations on text ranges feature but underlying problem was always there ready to trigger. For this case only render the full page if the state of comments scrollbars *toggles*, i.e. if there wasn't scrollbars and there ends up still with no scrollbars avoid the (bad) hack of invalidating the page (cherry picked from commit 378c74ce290ab772f962db51ff8cba200cb40144) Conflicts: sw/source/uibase/docvw/PostItMgr.cxx Change-Id: Ic7fd432d2317b0f5ad8d8773636f99fe75d660d6 (cherry picked from commit 7e75eab406c5e58e40987ab8a249dbacbb685551) Reviewed-on: https://gerrit.libreoffice.org/13279 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-12-02fdo#68684 export more numbering types correctly into HTMLAndras Timar1-4/+14
Change-Id: I6f1df02764f271143749ffbaeb4fc988b2f72f26 (cherry picked from commit c3d913724380eb76410dc0c792e9a307bbb24ca7) Reviewed-on: https://gerrit.libreoffice.org/13266 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-30fdo#72031 RTF import: bogus call to getBestTextEncodingFromLocale()Miklos Vajna2-2/+8
There were two problems here. First, commit bbe3627eece0c3486e7ea11f2f13377aaa3a8fed (rtftok: stop sending sprm:CRgFtc{0,1,2} tokens, 2014-03-05) broke the use-case when the font encoding is 0, but it's present. Before that commit, we parsed the font encoding instantly; after that commit we parse it once we have a font name. If we do that, then we have to have an idea if we have a font encoding. Given that 0 is a valid encoding, use -1 for the "have no encoding" case instead. Second, commit 7839633fb356285652ed96f4bf3f85bcd5b561a4 (fdo#85889 handle pc, pca and mac rtf keywords in writerfilter, 2014-11-24) abused m_nCurrentEncoding, which is meant to be used within the font table only. The problem with this is that this way only the first font will get the encoding, while the spec says it should be used in every context where there is no other explicit encoding. Fix this by setting the default encoding for those 3 control words instead -- and consider the default encoding in getEncoding(). Change-Id: Ia1d71f8ce70f2a53a3770b4840e21362d082e71f (cherry picked from commit fa15d039e3a553da8500c17190d27169a9477cf2) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-11-28fdo#79303: Revert "fdo#70861 SwToSfxPageDescAttr: fix call to ...Michael Stahl1-3/+2
... SvxExtParagraphTabPage" This reverts commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4. It is now simply wrong to claim that a SID_ATTR_PARA_PAGENUM item with value 0 is set, when that is a valid offset value. SwTxtShell::Execute() will call SfxToSwPageDescAttr() which pulls the SID_ATTR_PARA_PAGENUM out of the item set and sets it. Change-Id: If5a155c2874486b3ef7d01883fe73f8e5fca46fe Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-11-25fdo#78980 i#98931 Accept args for .uno:InsertAnnotationMaxim Monastirsky1-6/+17
(adapted from commit 917c52f3219149741199015fce1740c5b13d814e) Change-Id: I27b1b966135767d204a11a9d9f38ad6cc943ee61 Reviewed-on: https://gerrit.libreoffice.org/13067 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-24fdo#85889 handle pc, pca and mac rtf keywords in writerfilterAndras Timar4-0/+35
(cherry picked from commit 7839633fb356285652ed96f4bf3f85bcd5b561a4) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ic54f2233a37562bdc516e440af0b4b7973f56342 Reviewed-on: https://gerrit.libreoffice.org/13106 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-23fdo#82006 RTF filter: import \sbauto and \saautoMiklos Vajna2-0/+11
(cherry picked from commit bb77fd64f9219f1b8f990f5041d81cfddd021213) Conflicts: sw/qa/extras/rtfexport/rtfexport.cxx Change-Id: Iabff543c8191fc86dceb9274ea1552f60d73dabd Reviewed-on: https://gerrit.libreoffice.org/13054 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-11-20fdo#86131 SwXTextField::getAnchor: handle postit field with annotation markMiklos Vajna3-0/+29
(cherry picked from commit 2608512056b706bab57e36765e15f5c00668577a) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: I3881c4577375a2eda053f64800d0991de6f009ad Reviewed-on: https://gerrit.libreoffice.org/12979 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-18Enable copy-paste of charts/ole as bitmaps.Muthu Subramanian1-0/+18
Cherry-picked from 6296c64fb0ed8bce61eb6303920f952eda65de71 Change-Id: I0e074da34ff1a11c223994dcf373bf60af7cd271 Reviewed-on: https://gerrit.libreoffice.org/11911 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-18fdo#83204 RTF import: handle \pard<para props> after \bkmkstartMiklos Vajna2-0/+15
(cherry picked from commit 8a30ba573470d59dbb0501b488f8a655b015ffd2) Change-Id: I4f5f0f653f2ce7782ec1d1fc5ef550a21a9c1d35 Reviewed-on: https://gerrit.libreoffice.org/12527 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-17fdo#84645 RTF import: set DontBalanceTextColumns=true for the last section ...Miklos Vajna4-0/+21
... if it has multiple columns. See commit d185204737031955c56a24356ed003d342548434 (DOCX import: set DontBalanceTextColumns=true for the last section, 2014-07-17) for the DOCX equivalent of this problem; this just adapts the RTF tokenizer to dmapper. (cherry picked from commit d185204737031955c56a24356ed003d342548434) (cherry picked from commit f4bb73164a51ec83fe1d5975b1232d35f8a9e88a) Change-Id: Ib30f9b386e204b8b2987832ab17ee0cc53b3f0bc Reviewed-on: https://gerrit.libreoffice.org/12462 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-17Related fdo#82953: Forget package URL of image after it is loadedZolnai Tamás4-0/+58
It causes problems if we handle those imported images differently which are identified by a package URL, so after the first load remove this URL and handle images on the same way as inserted images. Some related bugs: * #i44367# * #i124946# * #i114361# * fdo#73270 The image in the test document has a special ID which is different from that one which is generated by LO internally so after ODF export the new generated image URL is different from the imported one. (cherry picked from commit 286e2f5c6ec829bc0987b1be7016699f7ef03e5e) Change-Id: Ic80adf76c72123af8e89ca3daa4dfa57d7c362a6 Reviewed-on: https://gerrit.libreoffice.org/12503 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-12fdo#80328: sw: fix inverted conditional in AutoCaption dialogMichael Stahl1-2/+2
(regression from af2d474ff9a91645043c1d4292891c313cceef5e) Change-Id: Ib22be881c82024e545752715bb9eeb2851a64f88 (cherry picked from commit 6e3c823f591365c94b22932f08f0884d372e083e) Reviewed-on: https://gerrit.libreoffice.org/12389 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-12fdo#85912 Delete surrounding text failing for input method calls regression.Justin Luth1-0/+3
When Apache OpenOffice code was merged in, a few lines were removed for no apparent reason. This just adds the code back in, and resolves the bug. See the comments in fdo#85912 for details about this bug. It is hard for majority language users to reproduce since they don't use ibus/kmfl to type their language's letters. Change-Id: I3963ea0f0eeeab8c8006408a7e229beab1ccf9f6 Reviewed-on: https://gerrit.libreoffice.org/12311 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 817da76529aa39f641d76805d429b09681348811) Reviewed-on: https://gerrit.libreoffice.org/12365
2014-11-11fdo#82512 RTF import: fix position of column breakMiklos Vajna2-0/+16
(cherry picked from commit dcb37dcebcde6188eb58ef7d8d34d08fea4badb8) Change-Id: Ib0f39c4af7cc32d0f4491f13ea207d90a449a47d Reviewed-on: https://gerrit.libreoffice.org/12309 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-11Resolves fdo#86008: fix a crash when open doc fileJulien Nabet1-1/+1
This was the only block, in this part of the code, which wasn't checking pSFlyPara->pFlyFmt Cherry-picked from dd8f3000f00c360ef3553ace6dc58b036e775e0d Conflicts: sw/source/filter/ww8/ww8par6.cxx Change-Id: Id467dd601a24ba46391544a79d4eecaf5370812c Reviewed-on: https://gerrit.libreoffice.org/12356 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-06Fix cherry-pick mis-mergeStephan Bergmann1-1/+1
82c01116a7df315b78bfd3af6ccd936572b45d78 "bnc#636128 DOC filter: fix handling of FFData.cch" Change-Id: I7d26c5950c3265db10e1611402ab3b63abbe2d4a
2014-11-06fdo#85812: RTF import: fix run type in new groupsMichael Stahl2-0/+111
Apparently the run type resets to LTR in a new group. (regression from fc49c052dbdbb5ab3b0a02a13143705f769b9662) (cherry picked from commit 88d3f9e4cf64e4ef037063b26ddf347fd42d8d84) fdo#85812: RTF import: better fix for run type in new groups Apparently Word treats \ltrch \rtlch differently from \loch \hich \dbch when groups are opened. Change-Id: I257712521e8e77fa66e76857489797ecc675506e (cherry picked from commit a9a9718bb1f64318429562ecdaa3d3763d9e2f4a) Reviewed-on: https://gerrit.libreoffice.org/12269 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-06bnc#636128 DOC filter: fix handling of FFData.cchMiklos Vajna5-3/+26
(cherry picked from commit dfa26e6d489a2c5bd79652450a9f27343008d37f) (cherry picked from commit 2ad1f195b875f2c1052c8ffab79602b9f6871ccb) Change-Id: Ia1a3a4ef5e61d8ed2a3bde689f3d2101525efc46 Reviewed-on: https://gerrit.libreoffice.org/12257 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-11-04Resolves: fdo#68347 fix word count with recorded changesCaolán McNamara5-43/+93
also see fdo#46757 a) We need to ignore redline-deleted text, but count redline-added text b) each block of text is denoted by its end position in the model and where that maps to in the view so a hidden portion should record its end point not its starting point, and a non-hidden deleted portion should always record its end point c) when mapping a model position to the view we take the offset of the model pos arg from the block end and use that to offset the mapped block-end view pos to get the final view pos. But for hidden portions that won't make a whole lot of sense, and end up offsetting into prior portions, so map all positions within a hidden portion to the same block-end view pos add regression tests for these cases (cherry picked from commit fa430e6b4e6f5d096bdf59db26e5d7393ca2297b) Conflicts: sw/qa/core/uwriter.cxx Change-Id: I45c76bba47fd430bc3bccb5f919502660d415d9e Reviewed-on: https://gerrit.libreoffice.org/12219 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-11-04CppunitTest_sw_rtfexport: fix windows buildMiklos Vajna1-2/+2
Change-Id: I79d4e46abe289b3d9c1f0a2eec2a29045891cae3
2014-11-04fdo#82076 RTF import: handle footnote in table cellMiklos Vajna2-0/+24
(cherry picked from commit 956c3ff3d43e1b181f7c91518edee1c7c4dc2a0a) Change-Id: I69def7936c320e93db5d4504922d52346caaf9cf Reviewed-on: https://gerrit.libreoffice.org/12242 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-11-04sw: fix windows buildMichael Stahl1-2/+1
Change-Id: I24aedc513897579b3f3c3bf9884183a67b93cd39
2014-11-03fdo#82858 RTF export: fix "none" line style of TextFramesMiklos Vajna4-0/+10
Regression from commit 9e6a5b94e00f0054b058dbb42c2c0b6c75236c9d (RtfAttributeOutput::FormatBox: export line{Color,Width} shape properties, 2013-04-15), in case lineColor is written, but there is no border style, then an explicit fLine=0 property is needed, otherwise a black border shows up. (cherry picked from commit f824b1b575dbdb2bc515656a66cbb94764031a44) Change-Id: I6d6eedbc8d3ee4bee0f2aadb51a376c7734c6640 Reviewed-on: https://gerrit.libreoffice.org/12185 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-11-02fdo#79602: sw: add new compatibiltiy flag PropLineSpacingShrinksFirstLineMichael Stahl7-3/+42
This is enabled by default, to get the new formatting where the first line of a paragraph is shrunk if a proportional line spacing < 100% is applied; existing OOo documents get the previous (before LO 3.3) formatting. Since the formatting in LO releases is broken anyway, it does not matter much which way documents written by old LO get formatted. (cherry picked from commit 9605763e3dc8c85137787c77c31e8639553a35ed) Conflicts: sw/source/filter/ww8/ww8par.cxx Change-Id: I0952f568a933c137bd03070759989cac3517d8b9 Reviewed-on: https://gerrit.libreoffice.org/12157 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-02fdo#79602: sw: fix text formatting of proportional line space < 100%Michael Stahl1-5/+13
SwTxtFormatter::CalcRealHeight(): Apply the special treatment of < 100% line space shrinking the Height() of the line only to the first line in a paragraph; the subsequent ones are shrunk again (to the square of the desired proportion) 30 lines later. Also set the Ascent of the line, as the wrong base-line causes the lower part of the line to be clipped. (regression from 42532d42bfcdb12df86376cda009e8e315a82153) (cherry picked from commit 4e223fab04279c3583689e69fa1342966e81de36) Conflicts: sw/source/core/text/itrform2.cxx Change-Id: I0424396263293deaa318c80eedc2237cdb01b22b Reviewed-on: https://gerrit.libreoffice.org/12156 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-11-01fdo#71248 Excel VBA: ActiveDocument is not tracking currently selected DocJustin Luth1-1/+1
Change-Id: I86606646206ec26e2822a6e27888537d44351b7b Reviewed-on: https://gerrit.libreoffice.org/11725 Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> (cherry picked from commit 4108bd9b7a41eaa0f3bf8b8173f27f57e009ee34) Reviewed-on: https://gerrit.libreoffice.org/11827 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com>
2014-10-30fdo#82859 RTF import: fillColor is unsignedMiklos Vajna2-0/+31
Otherwise ARGB 0xFFFFFFFF would turn into black. (cherry picked from commit 04ea7b24ec1b5a027efa0b850f2bc3ac7116c52e) Change-Id: I690f34d888ca9a013e8ce1af2c7ef8ed88ee28b0 Reviewed-on: https://gerrit.libreoffice.org/12153 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-30fdo#82859 RTF import: don't try to set CustomShapeGeometry on a TextFrameMiklos Vajna1-0/+25
(cherry picked from commit 6b7239855d8babdc1bcc7742f79ce2df64d1e476) Conflicts: writerfilter/source/rtftok/rtfsdrimport.cxx Change-Id: I687fa609559f0484fe6bb804265243de154c3760 Reviewed-on: https://gerrit.libreoffice.org/12122 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-30fdo#37960 fix shift+click to select multiple drawingsAndras Timar1-2/+0
I simply didn't get the logic behind calling GotoNextFly(). It caused not only this bug. For example Ctrl+click on a background text frame did not select the text frame, but an image on the previous page. Change-Id: I85ccbbda2f324de55417d6199b4abe79e59bf295 Reviewed-on: https://gerrit.libreoffice.org/12132 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-27fdo#85179 RTF filter: import image borderMiklos Vajna3-2/+42
Also adjust CppunitTest_sw_htmlexport that implicitly tested that there is no color around the image. (cherry picked from commit 01a32b7d074511bed24044dc94e1159aea62722b) Conflicts: writerfilter/source/dmapper/GraphicImport.cxx Change-Id: I8e14dfa7e7be80c4f8c492999071decae6a492e8 Reviewed-on: https://gerrit.libreoffice.org/12092 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-10-23various untrusted loop boundsCaolán McNamara1-3/+10
coverity#1242704 Untrusted loop bound Change-Id: Ib2e00c0cd269dc7ae55b206713fe07e5326072f2 (cherry picked from commit d615d83381a0830a815fe2879ce761f1b00b04e9) coverity#1242606 Untrusted loop bound Change-Id: Iafa03d4dd65eb343a80996880bc1ed846d1b7491 (cherry picked from commit 1361dfc0aa835dcb134d5de4bac594519aa16efe) coverity#1242582 Untrusted loop bound Change-Id: I72d2c4979b62a025d212ce5ee3b7141c40376fa7 (cherry picked from commit 6118c11a0c5122169979547e8c27136cf58a54a7) coverity#1242778 Untrusted value as argument Change-Id: I34d5a5e7c5f0eef51d941c65ab73d5421d5a36cb (cherry picked from commit be31503ef86d2ad3291ced8fddb9c4da4d324c46) coverity#1242724 Untrusted value as argument Change-Id: I6041d09ef0a4ed4af5f1bf93f31a1eac60be1af7 (cherry picked from commit bbe264a19fb82f50d859fc72a47312db0527640f) coverity#1242717 Untrusted loop bound Change-Id: I983bba075ab9626c90555fa41f9d473ae60fafea (cherry picked from commit cf63ebe0f005513c1e989682459bcd0688eb190b) coverity#1242624 Untrusted loop bound Change-Id: If2ae1982eec100f5602a13d648beec247ced6aa2 (cherry picked from commit 711e74544d70b108e9bc70772b31f386dbf1c2a4) coverity#1222238 Untrusted loop bound Change-Id: I1a4dec8727d0a27f7fd0396fd22d955f61daaee4 (cherry picked from commit 5a89092d5fe43638832ea8f86df34f81869337d9) coverity#1242573 Untrusted loop bound Change-Id: Id2847c55ccab7272919e76542bc0e0570bc9af12 (cherry picked from commit 5e2d089f763963e6ce7d3d183bd1bf7932aeaaaf) coverity#1242573 Untrusted loop bound (cherry picked from commit 11a514e06bf38c70f2364c8535782aa3f33d6206) Conflicts: vcl/source/filter/wmf/winwmf.cxx Change-Id: Ic84e57fbfa2b532409865c4364b91be594d252cf pass sfntLen to DumpSfnts etc so sfntP reads can be checked Change-Id: I5d8092eceb31ba251e75fe2c51b87890b8adcbf2 (cherry picked from commit b4a0104849eeecb7779fda41116c92c362759882) coverity#1242908 Untrusted value as argument Change-Id: If9dd92c361d406c435329d29870dc8bb07a8ba7b (cherry picked from commit d0be09322d127e7d517851db38c764d57fbab2dc) Reviewed-on: https://gerrit.libreoffice.org/12067 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-10-20Fix build breakage.Jan Holesovsky1-3/+3
2014-10-20html export: Fix export of checked checkbox and radiobutton.Marco Cecchetti4-1/+25
Change-Id: Ia77f9840df7508d96292aac63e65714a7892342f Reviewed-on: https://gerrit.libreoffice.org/12049 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2014-10-20fdo#83464 RTF import: \plain should reset \rtlch and \hich as wellMiklos Vajna2-0/+33
Regression from 36246aa9fb57c9fe4e546c91a8274d8828b1424e (RTF import: fix handling of \loch \hich \dbch \ltrch \rtlch, 2014-06-03), now that \f no longer means the ascii font name, \plain should reset a few more parser state members. (cherry picked from commit 69bf37136c1386c7220f38a896aa9865bdae665f) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Ia6b0bdf25563dd5300e108b46731751f0886f67d Reviewed-on: https://gerrit.libreoffice.org/12034 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-10-14bnc#800714 SwTxtFrm::FormatAdjust: still call SplitFrm if we have columnsMiklos Vajna4-1/+55
Regression from c5a8a2c3cbcee0175127a0662e3d820ea4deea22 (sw34bf05: i#84870 - method <SwTxtFrm::FormatAdjust(..)> - do not split text frame which only contains on as-character anchored object, 2011-03-11), the i#84870 fix was for a document which didn't have columns, and didn't consider that this causes a layout loop in case: 1) There are two paragraphs in a section, having multiple columns. 2) The second paragraph has fo:keep-together="always". In this case originally we tried to call SplitFrm(), realized that it didn't help, and then gave up. But after the change, we kept trying to satisfy the two conflicting requirements (balance content in the 3 columns vs keep the second paragraph with the first one). Fix the problem by not calling SplitFrm() only in case we're not inside columns. (cherry picked from commit 2d35baed5e87ffe7ca371986391cdb3983cdd2b1) Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: I64e969ef5e8f519314f5613f8e6fae626ae085ce Reviewed-on: https://gerrit.libreoffice.org/11973 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-11fdo#84679 RTF import: fix paragraph spacing handling in tablesMiklos Vajna2-0/+23
Regression from commit 1be0a3fa9ebb22b607c54b47739d4467acfed259 (n#825305: writerfilter RTF import: override style properties like Word, 2014-06-17), we failed to do the proper deduplication in buffered content, like tables. Fix this by adapting RTFDocumentImpl::replayBuffer() to RTFDocumentImpl::checkNeedPap(), which already did the proper deduplication. To be fair, the inconsistency was there earlier since 9f5263c477b82fef5aa9c3e79fb6af92aa049e24 (fdo#44736 RTF import: ignore direct formatting which equals to style, 2012-11-25), but it caused no real harm earlier. (cherry picked from commit e34906d20c9febc420b115fa2a8b171826dea0be) Change-Id: I0673408088d9d83768f0780ea92ece87913d03f3 Reviewed-on: https://gerrit.libreoffice.org/11914 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-11Resolves: fdo#65823 crash on negative position in redlined wordCaolán McNamara1-1/+1
there is possibly something deeper wrong here I think after all, see 946ea643185af680508a0333f63c086ed3f454a3 Resolves: fdo#84649 as well but for now silence this and I can investigate further later Change-Id: I1323584d1f71c14634d56ad4e4a705496b1bd1c0 (cherry picked from commit d7418f8831acdff907d404c1701870b00e974df6) Reviewed-on: https://gerrit.libreoffice.org/11884 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-11Resolves: fdo#55546 center ellipsis tooltips that don't fit on screenCaolán McNamara2-2/+20
(cherry picked from commit 912ecaf565e68d2ca3fb9584712313e712749f75) Conflicts: sw/source/uibase/docvw/edtwin2.cxx sw/source/uibase/inc/edtwin.hxx Change-Id: Ic44c9032878892fa33c839e5aaac1996e7bed943 Reviewed-on: https://gerrit.libreoffice.org/11874 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-09fix docx redline import (bnc#821804)Luboš Luňák6-0/+116
This is a squash of commits b6969634..fd26de3b. Change-Id: I8984001d7f85c00eb9b9943b25b8abb6e2ee28d3 Reviewed-on: https://gerrit.libreoffice.org/11789 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-08Resolves: fdo#84757 1~ instead of ~1 and 10~ instead of 1~0Caolán McNamara1-3/+4
regression from 3351ebde48a31173c2fea9f7270224017e1f4412 Date: Sat Mar 29 22:22:42 2014 +0100 OUString: remove temporaries and repeated expressions but understandable as it was unreadable goo originally (cherry picked from commit 4289c346de432cc94f05aab78a9464350334b11f) Change-Id: I3ce161bd2628f3a49b14df886ee8d684b248db1c Reviewed-on: https://gerrit.libreoffice.org/11847 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-08fdo#81750 MM: correctly convert inline-edit fieldsJan-Marek Glogowski1-11/+38
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. Reviewed-on: https://gerrit.libreoffice.org/10834 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2579adb13188d276701b1504b4a10bed4d8d4b6f) Conflicts: sw/source/core/doc/doc.cxx Change-Id: Ic1bce415ce45e49456121b6db003ded0733e195c Reviewed-on: https://gerrit.libreoffice.org/11782 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08Fix input field tab handlingJan-Marek Glogowski1-4/+30
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> (cherry picked from commit d33db207e27198df7af9fc007d7532ec76c80991) Reviewed-on: https://gerrit.libreoffice.org/11781
2014-10-08fdo#76565 Allow pasting into input fieldsJan-Marek Glogowski1-4/+2
Reviewed-on: https://gerrit.libreoffice.org/10835 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3f26ab24e0bfd27645c97ff7915fba2db409930a) Conflicts: sw/source/uibase/shells/basesh.cxx Change-Id: If996284aeea4b430cceaaf264035aa9e4ec0f2f0 Reviewed-on: https://gerrit.libreoffice.org/11780 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08fdo#84536 RTF import: don't try to rotate TextFramesMiklos Vajna1-0/+16
Regression from 818d80eb0cee65d1bcc4fdb74b32a7c42cc1336e (RTF import: support shapes inside tables, 2013-06-28). (cherry picked from commit 53b9a9bc7c84738545b5c7b791cea1e3d6a16c72) Change-Id: I05eb2f4f2e3467e35f96b280e3a79f69906a56de Reviewed-on: https://gerrit.libreoffice.org/11746 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-08fdo#79604: sw: fix clicking on hyper-links in Draw objectsMichael Stahl1-17/+21
The URL is dispatched in MouseButtonUp(), but this relies on MouseButtonDown() not selecting the drawing object when the cursor is over an URL field. (probably regression from commit 7e2f98d0a0c4a0f36a94353a256e7cc5caa3113b and commit 5ed14025645200c77249da364870f5772c01df17) Change-Id: Ib1504baff5d1fffd6ce53b41d3ff726d8e4d5c9d (cherry picked from commit 5284e44ed0594a79b0cc22090a9a82b19962f6c2) Reviewed-on: https://gerrit.libreoffice.org/11834 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-10-07fdo#84315: quick fix for sw tooMatúš Kukan2-1/+2
Similar to 08f33ca66559dfafd29ab0c6073232cf05a6d4e5 (cherry picked from commit 3c6f3290955cfaeaff4d1e38cb1b9d125eac4d61 and commit 37c00bff114fe39e553ea6f1b8e68d6c6ff93eba) Change-Id: I04f11a3821cb3793e5f993995b0c10fc7a62420b Reviewed-on: https://gerrit.libreoffice.org/11765 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-06Input fields are always editable...Jan-Marek Glogowski1-2/+1
if the document isn't read-only. So backspace should always work in input fields. Regression from 961315f0838197e71e9bd49169afe673466e5eb8. Reviewed-on: https://gerrit.libreoffice.org/10833 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 428c45fc779223371818bd11b2b846e1c13ebe47) Conflicts: sw/source/uibase/docvw/edtwin.cxx Change-Id: I06648ab075b198ee7914e7ae60bef87e7ff94f0a Reviewed-on: https://gerrit.libreoffice.org/11779 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-06Resolves: fdo#84588 loop in TableInfo::getNextNodeCaolán McNamara1-1/+7
Change-Id: I5bb44dc94041c3b3cd9d80ba125594a48c9c921f (cherry picked from commit f0859c4eae0f567393811c308074723329f1faab) Reviewed-on: https://gerrit.libreoffice.org/11828 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-10-03error C2216: 'override' cannot be used with 'inline'Andras Timar1-2/+2
libreoffice-4-3 is supposed to be buildable vith VS2010... Change-Id: Id980c709ee167133e2d8ba41902e43d0abe1034f Reviewed-on: https://gerrit.libreoffice.org/11777 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 19:24:21 +0000