summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2015-01-12build fix on OS Xcp-4.3-1Andras Timar1-1/+1
Change-Id: I27dd8e78059c331f8126a6ba0dcfc3391907c600
2015-01-12fdo#79810: SwTxtNode::IsIgnoredCharFmtForNumbering: ignore RES_CHRATR_COLORMiklos Vajna2-2/+23
And also in SwTxtFormatter::NewNumberPortion(), use SwTxtNode::IsIgnoredCharFmtForNumbering(), via checkApplyParagraphMarkFormatToNumbering(). Otherwise the color of the paragraph mark is inherited by the numbering portion, which is not what IDocumentSettingAccess::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING (mirroring Word's behavior) is supposed to do. (cherry picked from commit b2c1474c1dc93b69f0ede03fc5c9ab496c669955) Signed-off-by: Michael Stahl <mstahl@redhat.com> This fixes regression fdo#79810. Conflicts: sw/qa/extras/ooxmlexport/data/num-override-lvltext.docx sw/qa/extras/ooxmlexport/ooxmlexport.cxx sw/source/core/text/txtfld.cxx Change-Id: I5d8df9b404916cc4a4405bf796d971ede59e6111 (cherry picked from commit 54eb3d31b7be999468f1ae54a99730a8c739a22d)
2015-01-12sw: move IsIgnoredCharFmtForNumbering() to SwTxtNodeMiklos Vajna2-3/+5
I need this in SwTxtFormatter. (cherry picked from commit 96664bf0152ecf8ee64aa6b22ed399c1866117f1) Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: sw/inc/ndtxt.hxx Change-Id: Ib1586299f468a88e92fdb367fbab69a683791dc9 (cherry picked from commit 01c4588fdad04c45d239afb3136b82f72fdd1c80)
2015-01-12asan: global-buffer-overflow on ooo12093-1.docCaolán McNamara1-3/+4
Change-Id: I5e29626fe2803d2751bdec9c6919662ea37cf64c Reviewed-on: https://gerrit.libreoffice.org/13820 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit f35d61f021fc46b48ca1978ef6092e56a25c446a)
2015-01-08Resolves: fdo#73165 don't restart timer if already runningCaolán McNamara1-2/+4
If the timer is already running and you restart it then it starts counting down again so the timeout occasion just keeps getting pushed out indefinitely. Change-Id: I907dcc20c6fb4a770deeebba459fe68c24a4ec98 Reviewed-on: https://gerrit.libreoffice.org/13792 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 0823a95da37cc0cf9d0490a3a3c6c0e0e0d0e11e)
2015-01-08Resolves: fdo#87612 don't overwrite users input if the value is unchangedCaolán McNamara2-16/+42
so you can enter values without them getting auto-expanded to their canonical form as you're typing them and having the insertion point jump to the start causing real confusion. But retain the improvement of fdo#61704 where the value is set when modified so clicking "ok" without leaving the field works as expected Change-Id: I6d6b08a56def9961422b341b3a97dd29d366aa5d Reviewed-on: https://gerrit.libreoffice.org/13790 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 177cfe9b602a081f0c3a166e90aace16b868bca3)
2015-01-08fdo#83354: Chart is truncated - moved down outside the margins of the objectZolnai Tamás1-1/+6
Handle the case when the content height is unitialized (0). When content height is 0 it means there is no content (so we don't need to calculate adjustment) or the content height is uninitialized which leads to wrong calculated value. Regression from: cb19042f4395c97d123a27c6960d5e30d666c010 (cherry picked from commit 89a81a6610cf316666291750e7300bcd1a97d062) Change-Id: I45570a71f0597847820ce77e8dcec4a5b0c6785d Reviewed-on: https://gerrit.libreoffice.org/13783 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 32dce67106c9f6ddbb91daf4dd84308974ebe309)
2015-01-08asan: cast is totally wrong hereCaolán McNamara1-2/+3
Change-Id: I7341813b706faad60888e374fa50542abeb6842d (cherry picked from commit 3fab95491940160a1ee288491090b2f8b5875731) Reviewed-on: https://gerrit.libreoffice.org/13747 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit eb392a4bf464004396b48c56384886b8f1223538)
2015-01-08valgrind: uninitialized readCaolán McNamara1-0/+1
on loading id:000386,src:000000,op:havoc,rep:128.jpg as text Change-Id: I98364ffbcc4ea788613cc8071c4d8774ba167033 (cherry picked from commit 0b39d560da27ece227830a4bcc5556ae902a0921) Reviewed-on: https://gerrit.libreoffice.org/13744 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 013a6f221179503dab331f0256a0efbf9a629336)
2015-01-08fdo#87199: sw: fix root cause of a11y crash when merging cellsMichael Stahl1-1/+3
Commit f9eff2a402a4cd28d7dbfb6ce27cbf96b31e576f is not quite right because it will leave the mpNext chain unreachable; that could perhaps be imporoved by calling RemoveFromLayout(), but... Actually the problem is basically that one of the deleted SwCellFrms points to a SwTableBox with getRowSpan() -1 (because it has been merged) and thus IsInCoveredCell() returns true and that causes ~SwCellFrm() to skip disposing the SwAccessible stuff, so the SwCellFrm is still contained in the SwAccessibleMap. Because it's rather hard to prevent this sort of thing in general, better change SwAccessibleMap::Dispose() to assume that if it found its way into the SwAccessibleMap it should be disposed and removed. Change-Id: Ib4cec6924cb026ae30bdac6857957adf237b4d70 (cherry picked from commit 296e8b597c141b6b54cbf943871d6a6820c1779d) Reviewed-on: https://gerrit.libreoffice.org/13533 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 56d06e78ccdd8ae8c8e50a5b647272b4166f63cb)
2015-01-08fdo#84685: writerfilter: RTF import: support \xe index entryMichael Stahl2-0/+27
(cherry picked from commit f14e6e06b9e3c82c267649d63512a3538e5ee2f5) (related fdo#84685): writerfilter: RTF import: support \tc TOC entry (cherry picked from commit 1dd1dfc152c7cbeb374fe4f38b08c6af9cef2c06) fix Windows build (cherry picked from commit acfd640fd8547d3275c5db714b88d52b3fe7c4d5) Change-Id: Ia957541a5997961aa86b2eb8537ebd29d3092691 Reviewed-on: https://gerrit.libreoffice.org/13508 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit d90c5fbf67dc76c18cf703267139e7ad6b26564b)
2015-01-08DOCX import: handle section break right after a ToC fieldMiklos Vajna2-0/+12
The symptom was that during the handling of the XE field, we tried to access the top of the text append stack, but the stack was empty. The situation is the following: 1) There is a multi-page TOC field. 2) The page break inside the field is described using a section break, featuring headers, and the header contains a field that we map to a fieldmark. 3) There is an XE field after all this. The root cause was that during parsing of the header, some of the state should be stashed away and restored when we're done. The new HeaderFooterContext does exactly this, and now the number of push/pop calls on the text append context match again. (cherry picked from commit 153af84762f98d6c86c4c060b01402f40b2b0c24) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I10f259fd9edb8bd719ae5bc8a43ed5ef8c708071 Reviewed-on: https://gerrit.libreoffice.org/13524 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 99b3e159726b51537563790e8f73b43a88970e13)
2015-01-08fdo#85876: sw: fix attributes when splitting paragraphMichael Stahl1-6/+5
fdo#74981: sw: fix input field handling when splitting paragraphs The SwInputFld is copied because it doesn't have HasDummyChar() set although it has 2 dummy characters; TODO why is that... Change-Id: Iee91c1d0cf7a7a928e7383c1839f8192e8d4d5b0 (cherry picked from commit a1718045bd6218e07caebda7c4cacdcb853eabd3) fdo#85876: Revert "fdo#74981: cutting nothing should do nothing, ... ... should fix field dupes" This reverts commit f384598d8eec91c3c0f84a07ff3e59b8e3e13b3f. The attributes have to be copied in case splitting a paragraph creates an empty paragraph. Change-Id: Icd5730dd9ab8a68f737492645988a4d2f07af7a0 (cherry picked from commit 0f78ae1ca33f83737553ad204c869a63498b7d2d) Reviewed-on: https://gerrit.libreoffice.org/13486 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7f2ed29e1ca7782358f8dcc14f8c773c9bba3544)
2015-01-08fdo#86761 RTF import: positive border width and fLine=0 means no borderMiklos Vajna4-2/+54
Regression from 01a32b7d074511bed24044dc94e1159aea62722b (fdo#85179 RTF filter: import image border, 2014-10-23), there were a number of problems here: - CppunitTest_sw_htmlexport: revert back to the old behavior, where in case there is no border, we don't set the color of it. - The testcase of the above commit omitted fLine=1 shape property, which is present in the original bugdoc, and only with that should we put a border around the shape. - Let fLine=1 explicitly change the line style from NONE. - dmapper: if line style is NONE, then don't bother setting the border color and width. (cherry picked from commit 4568d1d298bf4fc98dcd86384743a04587a2fe6f) Conflicts: writerfilter/source/dmapper/GraphicImport.cxx Change-Id: Iffee41066d42822b699c478821645b9742df3f58 Reviewed-on: https://gerrit.libreoffice.org/13470 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit cfb770dc619fc33796b98ca900eb3fd7f714139e)
2015-01-08i#93570 DOC import: handle commented text ranges via RES_FLTR_ANNOTATIONMARKAndras Timar12-163/+221
backport from master: 271722d923610d128a358528e64d7233641ea0dc 677fdd4fa235466649911042577bc4980d42deb6 0ec0ec267986644084baaa5bda5ba917dc5744df
2014-12-17HTML export: optional CSS2 dot leaders in the Table of ContentsLászló Németh6-3/+104
To use it, enable "Print layout" in Options->Load/Save->HTML Compatibility, and select the HTML Document file type in the Writer Save As dialog. (cherry picked from commit 3e17677f705d004ebb87d1268d640da1a1c8cdf4) Conflicts: sw/source/filter/html/wrthtml.cxx Change-Id: I763ab8340a59050fd5c68677715679f41fd91fb3
2014-12-13Resolves: fdo#53460 crashes after casting SwTxtFrm to unrelated SwLayoutFrmCaolán McNamara1-9/+8
We still can't use ctrl+up to shrink the height of a row that has a table in it, but it doesn't crash anymore. This code presumably isn't truly table-in-table aware and should somehow step "over" the embedded table and not "into" it, which is what I guess it is doing here. (cherry picked from commit 5141f2e0d89a8a10f0009bea40cc5cd15bf4fcc8) Conflicts: sw/source/core/layout/frmtool.cxx Change-Id: I0e4c757c75438a89eb7721de32990f2f21c1ad8b (cherry picked from commit c1a5e49bdb0d6c1533d33520ea7c01a660a5d1f4) Reviewed-on: https://gerrit.libreoffice.org/13412 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-12-13fdo#75137: Can't Move Cursor Between Footnotes with Up/Down Arrow KeysTakeshi Abe1-1/+1
This fixes a regression introduced at 43941d9a5313fcd7fe39a61bd2eace64f7743486. Change-Id: If73883569049f0f3ae8a2d40f6704f74e63eecb2 Reviewed-on: https://gerrit.libreoffice.org/13401 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit dad173d9588e6abc2a465198b7d2881d4629246a) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-12-13fdo#86750 RTF import: fix table of contents linksMiklos Vajna2-0/+10
(cherry picked from commit 4517c94000153eab6c034ea548698953dd93f794) Change-Id: I0f3d35a0e64c9ce5646fa63eda317bee42de5540 Reviewed-on: https://gerrit.libreoffice.org/13372 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-12-13Only 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-13fdo#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-12-13fdo#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-12-13fdo#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-12-13fdo#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-12-13fdo#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-23fdo#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-23Enable 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-23fdo#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-23fdo#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-23Related 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-23fdo#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-23fdo#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-23fdo#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-23Resolves 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-23Fix cherry-pick mis-mergeStephan Bergmann1-1/+1
82c01116a7df315b78bfd3af6ccd936572b45d78 "bnc#636128 DOC filter: fix handling of FFData.cch" Change-Id: I7d26c5950c3265db10e1611402ab3b63abbe2d4a
2014-11-23fdo#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-23bnc#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-23Resolves: 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-23CppunitTest_sw_rtfexport: fix windows buildMiklos Vajna1-2/+2
Change-Id: I79d4e46abe289b3d9c1f0a2eec2a29045891cae3
2014-11-23fdo#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-23sw: fix windows buildMichael Stahl1-2/+1
Change-Id: I24aedc513897579b3f3c3bf9884183a67b93cd39
2014-11-23fdo#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-23fdo#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-23fdo#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-23fdo#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-11-23fdo#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-11-23fdo#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-11-23fdo#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-11-23fdo#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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 21:13:18 +0000