summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2015-01-27Resolves: fdo#84943 make fodt non crashy like odt for formulas inside shapesCaolán McNamara1-7/+11
where odt checks for a null pTxtCrsr and skips the object and fodt just ploughed ahead. i.e. make fodt equally useless as odt (fdo#84942) (cherry picked from commit 4345a3de0e5a600685fef5dc9fa422fe6849a0a3) Conflicts: sw/source/filter/xml/xmltexti.cxx Change-Id: I915cc1f7c065ea83377e895a932636c82698cf1f Reviewed-on: https://gerrit.libreoffice.org/14058 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-01-27Resolves: fdo#87601 specific html doc hangs on loadCaolán McNamara2-1/+101
Change-Id: I67f472d72efe123b533d4d94be0084986c0e8349 (cherry picked from commit 6acd5c45c764d81aea1539e66adbfadb51df0aa3) Reviewed-on: https://gerrit.libreoffice.org/14081 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-01-27coverity#1266508 Useless call (gold)Caolán McNamara1-2/+1
regression from commit 832e5aadbff006ec24959162c29756fe2b1982be Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Oct 8 10:06:59 2013 +0100 Related: fdo#38838 remove UniString::SearchAndReplaceAll (cherry picked from commit 6cde3ff3dd646f51f37f2342863371db8de9087a) Conflicts: sw/source/filter/html/wrthtml.cxx Change-Id: If792925eddc9c640584a2e8fa313a4297a32c74c Reviewed-on: https://gerrit.libreoffice.org/14172 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-01-08fdo#79269: fix ODF import of style:footer-firstMichael Stahl4-15/+55
The implementation of SwXStyle's FirstIsShared property is busted, and that causes xmloff to write the footer-first content into the master footer. This is a re-implementation of 0f21f932081471b2a5eda820fa1a194fbf3ab85c because unostyle.cxx is very different on master... Reviewed-on: https://gerrit.libreoffice.org/11722 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 902de8a1cbdb86c1eb1a05c8307b109fd75f493c) Conflicts: sw/source/core/unocore/unostyle.cxx Change-Id: I485d8089c1fb5ba3ca369fbfe8f3115bf700ba13 Reviewed-on: https://gerrit.libreoffice.org/11752 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-05valgrind: 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>
2014-12-11do not save UNO marks in undo historyLuboš Luňák1-4/+6
These are usually very short-lived marks that are used for various internal purposes or by UNO interfaces, so restoring them from undo history does not make any sense. It can in fact lead to a crash on undo if the mark has been already deleted (which is usually the case with UNO marks) but the restoring still refers to it (this is not a problem with other mark types since those should be deleted only when they are no longer in the document, in which case they are saved in undo history by content positions rather than mark references). Change-Id: Id707dc3d2b888b5c96a974d04a0ef17b22fc024c
2014-12-03Prevent occasional crashTor Lillqvist1-1/+2
I came across the crash by accident when checking how it works to have multiple windows showing the same document. Pasting in lots of text and then quickly telling LO to exit with Cmd-Q caused a crash here as GetPostItMgr() returned NULL. Change-Id: Ib9e636df0832a679a1d81fa3856ea0a7105a69c3 (cherry picked from commit 0eb1ef39084a978e8c2bec977ebabf6708f0c073) Reviewed-on: https://gerrit.libreoffice.org/13219 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-11-29Related: #i17171# identify places where -1 was cast to 0xFFFF in the pastCaolán McNamara3-9/+9
try and do so anyway. Could be picking that sort of lint out of writer for a while to come :-( (cherry picked from commit 16c565461b40c6876e69dc7bcc18f7c4db7fb94d) Note: this fixes fdo#80571 Note: for backport, removed any changes where the variables are still xub_StrLen; only sal_Int32 variables may have values < 0. Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: sw/source/core/crsr/swcrsr.cxx sw/source/core/text/porfld.cxx sw/source/core/text/txthyph.cxx sw/source/core/txtnode/fntcap.cxx sw/source/core/txtnode/txtedt.cxx Change-Id: I4efb94e5ed33025f7f416c096af25ba358ef45af
2014-11-28Revert "fdo#70861 SwToSfxPageDescAttr: fix call to SvxExtParagraphTabPage"Andras Timar1-3/+2
This reverts commit 5ce19ddcb6595c71980aecfa1e8c0827343159a4.
2014-11-16Related 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: I4e7d3490674c5f86bec5c7c6e1c975dcafd7c265
2014-11-10buildfix: sw ww8 export unit testcp-4.2-19Andras Timar1-2/+2
Change-Id: I011bea4f6da37e180446447dee1b79eee7bbd918
2014-11-04bnc#636128 DOC export: handle FFData.cchMiklos Vajna3-0/+20
Change-Id: Ia1a3a4ef5e61d8ed2a3bde689f3d2101525efc46 (cherry picked from commit 2ad1f195b875f2c1052c8ffab79602b9f6871ccb)
2014-11-04bnc#636128 DOC import: handle FFData.cchMiklos Vajna2-2/+6
(cherry picked from commit dfa26e6d489a2c5bd79652450a9f27343008d37f) Conflicts: sw/source/filter/ww8/ww8par3.cxx Change-Id: I8020ce561a72f10b8f0f517d50407a802049bd48
2014-10-29fdo#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
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/CppunitTest_sw_odfimport.mk sw/qa/extras/odfimport/odfimport.cxx Change-Id: I64e969ef5e8f519314f5613f8e6fae626ae085ce
2014-10-12fdo#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-03Related: fdo#73608 don't crash on missing table stylesCaolán McNamara2-0/+0
(cherry picked from commit 5fd7382651d64f77e8ad1d9a5c053f52f3641f9f) Conflicts: writerfilter/source/dmapper/DomainMapperTableHandler.cxx Change-Id: I340b43b7afc4c5c4d6dc8e4ed182279240306540 Resolves: fdo#73608 bail out on loop in style sheet hierarchy Change-Id: I03975d1ce8eaceceb4d5c263eb11c1521bcd57eb (cherry picked from commit be18133e84120625734a09380594ee89b23c4322) Reviewed-on: https://gerrit.libreoffice.org/11680 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-03Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::GetCaolán McNamara1-0/+0
Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f (cherry picked from commit 65277f994ae25d930c15aebba0ed19f8de0abba1) Reviewed-on: https://gerrit.libreoffice.org/11704 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-10-03Resolves: fdo#79129 Crash in oox::drawingml::LayoutNode::setupShapeCaolán McNamara1-0/+0
Change-Id: I0bafd2c43d29806eea0ff0cb165e67aece53488f (cherry picked from commit c84ce79132c674b4c2d31da8997ed77671323dfe) Reviewed-on: https://gerrit.libreoffice.org/11727 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-09-29map FRAME to VML's textLuboš Luňák1-2/+2
Again, that's what this file does elsewhere, that's what (incomplete) import did before my changes, and it seems to match better the position that such an element gets in Word. Change-Id: Id09150eaaa505e6ddcd4baaf4a833000d52dd71d
2014-09-29map PAGE_PRINT_AREA to VML's marginLuboš Luňák1-2/+2
That's what the code does elsewhere in this file, and also import does it. Change-Id: I30e608f86a9cae66eed48dbb2e719b1455327ae3
2014-09-29proper reading of mso-position-(horizontal|vertical)(-relative)Luboš Luňák1-2/+6
Change-Id: I50f537c697f6e73c1fd150f3f03fc65b85ccbeaf
2014-09-29export in .docx also vml mso-position-(horizontal|vertical)(-relative)Luboš Luňák1-83/+83
Change-Id: I65321bb6244e0e37ef673d726b698c3708711d53
2014-09-29docx ST_VAnchor does not know "column", it should be "text"Luboš Luňák1-1/+1
Change-Id: I3a5ab08e349c5c071373cda2f62e3cea593e263c
2014-09-23Do not link html images only when pasting from clipboard (bnc#580834)Matúš Kukan1-1/+2
Conflicts: sw/qa/extras/htmlimport/data/picture.html sw/qa/extras/htmlimport/htmlimport.cxx Change-Id: I020c4e6ed6d468e553dedd7c91979b081d6b4725
2014-09-23bnc#580834: HTML import: Embed images if source URL is a local file.Matúš Kukan1-7/+15
Use also INET_PROT_FILE to determine whether to import images as links. (cherry picked from commits 3914a711060341345f15b83656457f90095f32d6 and 72703173066a2db5c977d422ace59d60b998bbfc) Conflicts: sw/source/filter/html/htmlgrin.cxx Change-Id: I22a5ded92d9aac4220c0c4fa8bb8a9490f5c61a6
2014-09-23handle docx's w:anchor layoutInCell attribute (bnc#891663)Luboš Luňák2-0/+9
(cherry picked from commit 3891ba42a886fa85eb43da24d1badf44e765d54c) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx writerfilter/source/dmapper/PropertyIds.cxx writerfilter/source/dmapper/PropertyIds.hxx Change-Id: I8268567b84aa0f6e42624bfd0f79c8c49c153edd
2014-09-17fdo#65836 bnc#621241 Do not compress WMF / EMF file incase of OOXML exportNikhil Walvekar1-1/+1
(cherry picked from commit 8fe352be80ff69552f622f3c7a6a6f269912ab71) Change-Id: Ic498e5703ab48719f998be6da3f245843cc0979d Reviewed-on: https://gerrit.libreoffice.org/11426 Reviewed-by: Nikhil Walvekar <nikhil.walvekar@synerzip.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-09-11Resolves: fdo#82114 RTF import: fix handling of first page in non-first sectionMiklos Vajna2-0/+23
Change-Id: If06c6bcdda97447e6014223d997c7ff8abd64b48 (cherry picked from commit 04fe5e6a31c9701177a744bbc8a53b2f664fe71c) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx
2014-09-11Related: fdo#82114 Copy first-header-footer test from ww8 to ooxmlLuke Deller2-2/+8
The test document was converted from doc to docx using MS Word 2010. Several fixes were required to make this test pass: - Do not clear the "FirstIsShared" property on page styles, as the code instead uses the old fashioned method of translating a Word section with "different first page header/footer": two page styles linked together, the first page style and the follow page style. (Also remove a wrong test case which checks the FirstIsShared property) - Do not clear the "HeaderIsShared"/"FooterIsShared" properties on the first page style, only on the follow page style. - Actually set the "FollowStyle" property on the first page style to link it to the follow page style. This didn't matter for the very first Word section because it was mapped to the default page styles "First Page" and "Standard" which are already linked, but it does matter for subsequent Word sections. - For some reason setting a new page style at a section break was excluded in the case where the following section had a title page. Remove this exclusion. - The exclusion mentioned in the last point was masking that bnc#751077 was not entirely fixed. To resolve that issue: When checking if the last paragraph of the section is empty, consider not just text content but also shapes. - Remove a workaround for bnc#780843 involving copying of headers and footers from the "Standard" (first section) page style in the case where the following section had a title page. This workaround is no longer needed as the test case passes without it. (cherry picked from commit b4ccde72b8e2e45e7276d5b08b182495a1b1a617) Change-Id: Iacc9bba0720c11414da3e852892cff301ebbc4fe
2014-09-11abi#10076 RTF export: handle frames without a valid anchor pointMiklos Vajna1-4/+3
Ideally all frames have an anchor point in the maFrames vector, as provided by MSWordExportBase. If that's not the case, then we have no idea what would be a valid anchor point: just export those as inline, as we did before. (cherry picked from commit 2f33111510c87ca310fde346e223bd6e750b2248) Change-Id: I81134d9fb8dc4ca166084964d277ac02ceccde7b
2014-09-08fdo#79959 RTF import: trim whitespace around style namesMiklos Vajna2-0/+10
(cherry picked from commit 305ecd1848a802a6c43ecc6e76f4c6bc36a03418) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Id23cbd62b057442c577fef124a5705e4d551076f
2014-09-08abi#10039 RTF export: support page-anchored framesMiklos Vajna3-7/+21
(cherry picked from commit 845fb7bf6753ec9582d0b1d1c9b4276aa9e6c65e) Conflicts: sw/qa/extras/rtfexport/rtfexport.cxx Change-Id: I71c961799f76446cdf24faeba86f881ae02ffe3b
2014-09-08fdo#32613 RTF export: implemented anchored picture exportMiklos Vajna4-7/+93
RTF originally didn't support anchored pictures: they were always inline. Then it was invented that pictures can be exported anchored, if they are in fact shapes, but their "pib" property is set to the hexdump of the picture contents. The RTF importer handled this situation for quite some time, but not the exporter -- this commit implements that. (cherry picked from commit cb01957aa0ac3caea8e87522116086ac256d4ee2) Conflicts: sw/qa/extras/inc/swmodeltestbase.hxx sw/qa/extras/rtfexport/rtfexport.cxx sw/source/filter/ww8/rtfattributeoutput.cxx Change-Id: I173ad9f4f2e24620508ca63c0b892b7d5da4e5b2
2014-09-08fdo#74229 import RTF_TRGAPHMiklos Vajna2-0/+43
Regression from commit c4b91ae3178011c66c76c711c1a6469ba658872e (fdo#55525 import RTF_TRLEFT, 2012-11-13). (cherry picked from commit 54bdfe0a891f2119bc35c5d82ecbc94c8cb13c0b) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I90f2c6399cfaf8399de0cf3488a23af6cc84710d
2014-08-26fdo#39056 fdo#75431 Section Properties if section starts with tableVinaya Mandke2-0/+12
Section properties are not imported if the section starts with a table for DOCX, and also for a few RTF files with combination of tables and section breaks. SwXBodyText::createTextCursorByRange is not able to find the start of section and hence section properties are not applied. As a workaround added an empty paragraph at the beginning of every section which has the the first element as a table. And then removed it when the section ends ( DomainMapper::lcl_endSectionGroup is called). Also handled to add the paragraph earlier, if there is a bookmark so that the bookmark is not attached to the dummy paragraph. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/9097 Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I717ba40e22b055d974bc83d4414aeb2945e16d26
2014-08-21avoid crash on document ending before contained table endsCaolán McNamara1-0/+2
Change-Id: I003b7e00673cd5a4b4f0ed5218e2d30cfef04ffb (cherry picked from commit 5a2123376dc010ca4e3f0a19d7dbbfaeb25ea963) Reviewed-on: https://gerrit.libreoffice.org/11057 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21sw: ww8: fix another ~SwIndexReg() assertionMichael Stahl1-2/+4
If the position is the same as the body text anchor position, don't delete the node. Probably something should have inserted more nodes between StartApo() and StopApo(). Change-Id: I41110a47d840e764f6d2a24e43bf6938b1282972 (cherry picked from commit 404f16e97f1c2fcd8f9a1297bdfa46cba970467e) Reviewed-on: https://gerrit.libreoffice.org/11048 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-21misplaced test from 5a454e5ed3f1: should be Linux onlyMatúš Kukan1-2/+2
Change-Id: I32df6241f9b1259f1b563826a0d0b8e468ecf4bc Reviewed-on: https://gerrit.libreoffice.org/10997 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21fix reading a .doc that has frame anchored to the end of page (bnc#787942)Luboš Luňák4-1/+22
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 (cherry picked from commit 4a1888a97eab4ead2e0bec76cd1cba410a8e7e13) Reviewed-on: https://gerrit.libreoffice.org/10952 Reviewed-by: Matúš Kukan <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-08-21Resolves: fdo#81046 don't crash on compilers that enforce exception specsCaolán McNamara1-5/+13
bit of a hammer here, the offending property is "IsSplitAllowed" if someone wants to attempt a more subtle fix (cherry picked from commit b59931d8a62f761022929f58f27d7ba22536b570) Change-Id: I37ed623a9947473fcb5c9e2b987d7a3dd9147ffa Signed-off-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-21fdo#82165: ODF import: clear all shapes when removing header contentMichael Stahl2-0/+10
Shapes anchored to the first or last paragraph survive setString("") so need to be deleted with some ruse. (regression from b8499fc3dcf474050f026b8d5cd1d9037bbe42b7) Change-Id: I00a8132583c45d1953c207932cc7f02f3065ae77 (cherry picked from commit 555c988f3b896e16afc7bdd1bd98e48229599637) Reviewed-on: https://gerrit.libreoffice.org/10895 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21SwDoc::CopyPageDesc(): probably sending Modify for first too cannot hurtMichael Stahl1-0/+6
Change-Id: I2056bee7555d3f6723ac374863187d82e4ad9edd (cherry picked from commit 2e9840d18c09ce5552eec2f9d489d952da1034ae) Reviewed-on: https://gerrit.libreoffice.org/10775 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-21fdo#69282: sw: fix updating of page styles via SwDocShell::_LoadStyles()Michael Stahl1-0/+16
SwDoc::CopyPageDesc() only copies master and left SwFrmFmt attributes, but not first-master and first-left. They will contain exactly the same attributes as master and left but they still need to be copied... (see also: that FIXME in pagedesc.hxx) (regression from 75084f6c42c27dc95418df9cefed2fddfb26000e) Change-Id: I3dcc3627708b5d6a477eb7fef76cf6c42c95c004 (cherry picked from commit 5c1cc92ee09f9fcc99077cacd3fc55640f03b7b2) Reviewed-on: https://gerrit.libreoffice.org/10774 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-21fdo#80986: disable highlight DOCX importZolnai Tamás1-0/+2
Highlight support is not implemented fully, so it seems better to disable DOCX import of it until it is finished. Highlight can't be modified on the UI and is not saved to ODT/DOC (regression). Regression from: 8b949134441056a1455d67ddfdd7e0bc5f2ee682 (cherry picked from commit b5e60724ac73bb0e62b249145a8931fd6166bb69) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I94891769766ae90017e8afa70e65d080d5270202 Reviewed-on: https://gerrit.libreoffice.org/10721 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-08-21fdo#78904 : LO hangs while saving the document.Umesh Kadam3-0/+11
- 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. Reviewed-on: https://gerrit.libreoffice.org/9774 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 75fc9e669f209472ec6a282848166d96d02d84d9) This also fixes fdo#79391, but not compeletely on this branch. Change-Id: I4c35f7eff6ca1122901f5667fc26b849df527f60 Signed-off-by: Michael Stahl <mstahl@redhat.com>
2014-08-21fdo#78502: writerfilter: RTF import: handle \u keyword inside levelnumbersMichael Stahl2-0/+18
The ";" terminates an entry and shall not be inserted as text, even if some over-engineered producer encodes it as {\uc1 \u59 ?}. Also, remove the special-casing of the \leveltext destination, since the bugdoc does contain \uc inside it and it's not obvious why that should be ignored. (cherry picked from commit e93f0852477b44df986807860c821319a921b199) fdo#78502: actually empty parameter to getParagraph() is not tested (cherry picked from commit b9dca968c6fd0ab5ca140c65b0e54d153cd34986) Change-Id: I1e19c9df39597cb1b22bbda97853c829d7812e29 Reviewed-on: https://gerrit.libreoffice.org/10398 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-21Related: fdo#81641 create new styles with an initial nameCaolán McNamara1-1/+5
instead of creating with a blank name and changing it later this way undo of a style creation is initialized with its name and so create a style followed by deleting a style and undoing all those steps doesn't crash (cherry picked from commit e904562af54545684b32d2042ded6bdb9459edca) Conflicts: include/sfx2/styledlg.hxx sw/source/uibase/app/docst.cxx Change-Id: Ida7a34410d5d7b05edcb86950aabb3c672b82c8f style category listbox depends on being unsorted regression from commit 6ecfbf153a7c11c63d208630ac6a27064058099d Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Mar 13 15:10:25 2013 +0000 drop unused resources and toggle label to activate replacement widget Change-Id: I65ca8ec58ed984120f3c2e7ba68507cbf8acf089 (cherry picked from commit 11fab6b705638359b2ca0e3e85590aa7cc70a03a) Related: fdo#81641 exclude 'all styles' category from organizer page it doesn't make sense to be able to assign a style to 'all styles' Change-Id: I632c62f293b553e436ceb8da0baf2bb39941fd39 (cherry picked from commit 2223ff6cb99df097a357674801835c7a260b551d) Resolves: fdo#81641 the new style shouldn't be a conditional style regression from commit 715d79bcc59d68c77dc84a1038998dd873df92e9 Author: Cédric Bosdonnat <cedric.bosdonnat@free.fr> Date: Fri Nov 30 11:51:46 2012 +0100 Styles & Formatting: added SFXSTYLEBIT_ALL_VISIBLE and show hidden styles commit 2fd9c2bf9af0c50dae3af3dbe5e22965ccdb4ae7 Author: Cédric Bosdonnat <cedric.bosdonnat@free.fr> Date: Sun Nov 25 15:24:42 2012 +0100 Allow to hide styles in the "Styles & Formating" dialog In its current state, the feature only hides the styles. Things to sort out are: + Add some automatic filter to show hidden styles + Make the visibility persist in the file format (cherry picked from commit 1af0e46102350114dd5e854b7692c640dae2727f) Conflicts: sw/source/uibase/app/docst.cxx Change-Id: I7244d424765db0d5ed3aeaf380a8e1af56aa7eaf Reviewed-on: https://gerrit.libreoffice.org/10503 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-27fix build of last commitLuboš Luňák1-1/+1
Change-Id: I3c2e4763f25580c3418d476479a81efe65414b40
2014-07-27Fix for Footer is missing if fisrt page different header/footer is setRohit Deshmukh3-1/+9
Reviewed on: https://gerrit.libreoffice.org/7589 Signed-off-by: Luboš Luňák <l.lunak@collabora.com> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I2a2f2abc0dcf5542b7b950f9a232d7155a055fdd
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 06:29:37 +0000