summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2013-06-04i#30979: sw: fix crash on Flys anchored in ToXMichael Stahl
When a fly is anchored at the first paragraph of a ToX, as happens in the WW8 bugdoc in i#30979, updating the ToX will remove the anchor node, and bad things happen, including ~SwIndexReg assert and also eventually a crash when editing the Frame and updating the ToX a few times. Probably best to really remove all anchored flys here. Note that it's not enough to re-anchor to the empty node that is inserted here because that one will also be removed again. While we're at it the _DelBookmarks is superfluous because CorrAbs does exactly that 2 lines above. Change-Id: Id40ae1d88ad99813b93bea7470f5dc790edcc80c
2013-06-03Prefer prefix ++/-- operators for non-primitive typesJulien Nabet
Change-Id: I1310ac912aa2031b15851339fd84d435308350a9
2013-06-03SwDoc::AppendRedline: fix an obscure memory leakMichael Stahl
... that also causes ~SwIndexReg assertion on closing the document. Change-Id: Icea617c893ddc08b817a5b16f68fa128a41531d4
2013-06-03sw: fix ~SwIndexReg assertMichael Stahl
Not really a problem, since local aRegion's point is not used after its node is deleted. Change-Id: Ibeb885fb31f19b02e4c3c63e3b99d00ced756810
2013-06-03Fix icu version checks.Mark Wielaard
commit 30c303 "Make charmap.cxx compile with icu >= 4.4." was incomplete and had wrong version checks. After ICU 4.8 (4.8.1.1) the next version of ICU was 49 (49.1) so U_ICU_VERSION_MAJOR_NUM contains two digets (49), earlier that it was just one digit (4). The correct header to include to do version checks is unicode/uversion.h. USCRIPT_MANDAEAN is the old alias of USCRIPT_MANDAIC (same numeric value). U_JG_FARSI_YEH is only available since ICU 4.4. Note that on older icu versions (4.2.1) the 200B (ZWSP) Zero Width Space breakiterator testcase fails (others succeed). Change-Id: If73c1402239a28546077437e9382f0bd38642bad Reviewed-on: https://gerrit.libreoffice.org/4139 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-06-03Introduce DocxExport::getBackground()Miklos Vajna
Does the same as part of DocxExport::WriteMainText() and DocxExport::WriteSettings(). Change-Id: I5597edc2c3a84bd2058ee8c4cfdc21241e471bd3
2013-06-03fdo#46808, Use service constructor for ZipFileAccessNoel Grandin
Change-Id: I9c3f8e2df56953487329bdbbac251b3af8cd9917
2013-06-03fdo#65257 : DOCX not exporting background colorAdam Co
Signed-off-by: Miklos Vajna <vmiklos@suse.cz> Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: Ida3f66d5adb063400494e1da589a463b4d7c2a86
2013-06-03fdo#57874: verify GetRedlinePos return value before usagePierre-Eric Pelloux-Prayer
Make sure return value of GetRedlinePos is checked each time before usage. Fix crash in Redline dialog. Change-Id: I5586d8ddc1a7905c524a522addc89969e704048d
2013-06-02fdo#39468 Comment translation GER-ENG in sw/source/ui/unoMatthias Freund
Cleanups and translations. Change-Id: Ia5ef91c120354ed868a69c3dbfc9cebe0fd61bab Reviewed-on: https://gerrit.libreoffice.org/4129 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-06-01Fix typo: connections -> connectionSophie Gautier
Change-Id: Ica73de8975de0c3565e3eaad82e6dbb677bec33d
2013-05-31convert writer formatting aids page to .uiFaisal M. Al-Otaibi
Change-Id: Ia5ca3f74ebfea2a927fe8845f1a8237a96e32df7
2013-05-31audit incorrect uses of SwDrawTextInfo (fdo#65013)Luboš Luňák
f22006dc6ac34a35a060e15466cf6b2d2058617d stopped SwDrawTextInfo using pointers to outside data (which lead to various uses of variables that have already gone out of scope). This commit (hopefully) fixes all uses of the clash that relied on the fact that the underlying data changed behind the scenes. Change-Id: I820f13a90b9d1a8055f8e317ca8debc969c39bc0
2013-05-31Resolves: #i120030# optimize thumbnail creation/paintingJürgen Schmidt
(cherry picked from commit 255beb8f56a074ce85eaf1db3cdf168f9c09466e) Conflicts: sfx2/inc/sfx2/objsh.hxx sw/source/core/layout/paintfrm.cxx Change-Id: I23157f7a6983ba81b1c8ddcc409a4989915be2ed
2013-05-31Resolves: #i119558# set default page mode value to false for docxJian Fang Zhang
To avoid default page mode affect the calculation of table row height Found by: xiao ting xiao, tingxiaox@gmail.com Patch by: zhaoshzh, aoo.zhaoshzh@gmail.com Review by: zhangjf (cherry picked from commit 28e1cb1240e7c7a274a04756c7cab2f5797de400) Conflicts: sw/inc/unomap.hxx sw/inc/unoprnms.hxx sw/source/core/unocore/unomap.cxx sw/source/core/unocore/unoprnms.cxx sw/source/ui/uno/unotxdoc.cxx writerfilter/source/dmapper/PropertyIds.cxx Change-Id: I41745eb9d727a5ae87d34872f9dc3f4442c7bc8d
2013-05-31n#816593: docx consecutive tables with different tblpPr needs to be splitCédric Bosdonnat
When importing docx with 2 <w:tbl> following each other, we have 2 possible behaviors: either merge them as one table as we did before or split them into two tables. The tables need to be split if they have different floating position properties. This required the ooxml tokenizer to repeat the table properties for each row of the table: or how would we know we don't need to split the table? The basic idea behind this hack is to temporarily store the table position and table properties before saving them. Thus we can compare them at the end of the row and decide to split the table or not. Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4
2013-05-31sw: SwXFrame: fix gradient import problem:Michael Stahl
BaseFrameProperties_Impl::FillBaseProperties: It may happen that checkForUniqueItem returns an item with a name that already exists, if the same gradient appears multiple times; don't crash with unhandled ElementExistException then. (can be reproduced with test3.docx from fdo#41466) (regression from 1a3c90a292c7fc9060604151de9dc51eecf5b6a7) Change-Id: Iace7af4c5679c1c7e978525fa31abf884038567c
2013-05-31Fix crash with ooo120774-1.docFridrich Štrba
Do not try to remove line breaks from empty string Change-Id: Ieb12c541d42944aac813cee10ce479207b1c674b Reviewed-on: https://gerrit.libreoffice.org/4114 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-31TP_COMPARISON_OPT is now unusedCaolán McNamara
Change-Id: Ie73070c97f9918511a02e7c4d4073387385e9293
2013-05-30gbuild: fix deps on svx/globlmn.hrcDavid Tardon
Change-Id: I5373c0a59fdbbe0230b74df967fdaf887b91f4e4
2013-05-30fix spellings in opt comparision .ui conversionCaolán McNamara
Change-Id: If5d85eede864adf150c417adeb08fc32e5eb7acf
2013-05-30Resolves: fdo#65139# #i122416# SwDoc::GetPageDescFromPool correctionOliver-Rainer Wittmann
and refactoring (cherry picked from commit 384aa00b12fbfd0d888858dc5677825637e1e98b) Conflicts: sw/source/core/doc/poolfmt.cxx Change-Id: Ia5567173153e218b754ad73c50b56eff87b49822
2013-05-30Convert Comparison tab page to .uiabdulmajeed ahmed
Change-Id: Ia1cd8c868de4c73ae518b2775dc568d32a15f16f
2013-05-30Make use of IsStarSymbol()Thomas Arnhold
Change-Id: I7a2e3a6f11bbaaaff50e8163e4ce3e2583b1d03c Reviewed-on: https://gerrit.libreoffice.org/4077 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
2013-05-30bnc#817956 page border shadow testcaseMiklos Vajna
Change-Id: I1ded79d89dcceb3bae5926a2f217cde8bf6aa830
2013-05-30sw: unused includes in dbg_layMiklos Vajna
Change-Id: I6707a5911fa8b97946c72c1846e1235032680ead
2013-05-30sw: unused includes in colfrmMiklos Vajna
Change-Id: I8ddd17b7192005bbb46f9ed531cbb549ec58963d
2013-05-30sw: unused includes in calcmoveMiklos Vajna
Change-Id: Id84e4df270e302399c4696e11da2d09f2ef44899
2013-05-29WaE: C4146 unary operator applied to unsigned typeMichael Stahl
Change-Id: Ic23667dc5fb455a7b11f49f4a13df2c49496f702
2013-05-29valgrind: fix leakCaolán McNamara
Change-Id: I3c8fdc00c3d4c6adaf6f1f790ed0549676e76772
2013-05-29bnc#817956 v:textpath VML import testcaseMiklos Vajna
Change-Id: I4c4c3a84e8d9d048262e6570a8bed0106e8d184f
2013-05-29convert more queryboxes to new message box replacementCaolán McNamara
Change-Id: Ice41a86e17d5cbee784e239224b640ea4378ac36
2013-05-29Resolves: #i122351# Rearrange controls of Cross-reference pageAriel Constenla-Haile
in Fields dialog Patch by: Tsutomu Uchino (cherry picked from commit 5e59a33a330ec1bbc7ebea0c43d59eadc7460b9b) Change-Id: I8e7264caa875fe49cf66a24e201fbf8966aa19fa
2013-05-29provide complete type of CellInfo before it is usedHerbert Dürr
(cherry picked from commit 687d6ed3e4ecb836634bfda71bb5596e18bbc2e1) Conflicts: sw/source/filter/ww8/WW8TableInfo.hxx Change-Id: If21c5d7c6db2803f7da59e28c00d47790abffe86
2013-05-29import RTF_BACKGROUNDMiklos Vajna
That destination contains a whole shape, but the only interesing detail of it is the fill color, which is the page background color. Change-Id: I9527db8954c48c980f8734c9bbeaa6ccd3c48fbc
2013-05-28<SwDrawTextShell> - remove self-destructing call to ↵Oliver-Rainer Wittmann
<SwView::AttrChangedNotify(..)> - remove superfluous slot invalidation (cherry picked from commit 2ff25b11b2c9e187f3ed26daeba3b5619289ecc1)
2013-05-28Resolves: #i120515# Implemented and finetuned the enhanced Undo featureArmin Le Grand
(see #i120498#) for sw (cherry picked from commit fb2580f1c8ae0cd1418c257823dc2d735607655f) Conflicts: sw/source/core/draw/dview.cxx sw/source/core/inc/UndoManager.hxx sw/source/core/undo/docundo.cxx Change-Id: I9970377d66f1104448a2ee7e4fb1cf82bf559cd8
2013-05-28fdo#64451 Add "Find All" to the Find bar.Andrzej J.R. Hunt
Change-Id: I7a5f2881d2aa77f2d5c6c302c8eac1162b194bcf Reviewed-on: https://gerrit.libreoffice.org/4016 Reviewed-by: Jan Holesovsky <kendy@suse.cz> Tested-by: Jan Holesovsky <kendy@suse.cz>
2013-05-28n#816593: Floating table width import fix: adjust the frame widthCédric Bosdonnat
Change-Id: I8212bc5981418f6cbd514bf5002e6a5dbdf53152
2013-05-28Resolves: #i113600# Add call to subtable SwXMLTableRow_Impl.dispose()...Jian Fang Zhang
to break cycle reference to SwXMLTableContext object Found by: zhangjf Patch by: zhangjf (cherry picked from commit ba47a717e009b2b497cbccfca2872e66f9ecb130) Change-Id: Iba0b581920417b3866b07542621d56ccdc272261
2013-05-28sw: extend READMEMiklos Vajna
Change-Id: Iaad121a3333ab7cffcc2cbd6cb1b3e447f0989f7
2013-05-27bnc#817956 DOCX import of document background colorMiklos Vajna
See wwSectionManager::SetSegmentToPageDesc(), this has to be applied to every page style. Change-Id: Iea2707ae665a55eabda3ed7575cf3658f7af5237
2013-05-27fix fdo#64872 infinite loop saving as docLuke Deller
When loading from odt, table cells which are covered (due to merging of cells) are replaced with an empty cell by SwXMLTableContext::ReplaceWithEmptyCell. However if there is a sequence of cells covered from above then their replacements are accidentally inserted in reverse order, which produces this infinite loop problem when saving as doc. The reverse ordering in SwXMLTableContext::ReplaceWithEmptyCell was because the insert position came from SwXMLTableContext::GetPrevStartNode which was very careful to skip previous covered cells. However those cells have already been replaced with an empty cell so they should not be skipped. Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363 Reviewed-on: https://gerrit.libreoffice.org/4008 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-05-27Fix issue #i120654: Number range variable filed shows in AOOJian Hong Cheng
* sw/source/filter/ww8/ww8par5.cxx MS Word Binary compatibility Patch by: Jane Kang,<kangjane2012@gmail.com> Found by: Yan Ji,<yanji.yj@gmail.com> Review by: Jian Hong Cheng,<chengjh@apache.org> (cherry picked from commit 720fc77527377968a45631d1c6a711b4cae02d39) Change-Id: I428fadd46bbd5b57081e35dcbfd6bb0c10c08282
2013-05-27Make .uno:Open a drop-down toolbar itemAriel Constenla-Haile
(cherry picked from commit b38a51d67373daf9a45a4701e7c760c7b3571a66) Conflicts: chart2/uiconfig/toolbar/standardbar.xml dbaccess/uiconfig/dbapp/toolbar/toolbar.xml sc/uiconfig/scalc/toolbar/standardbar.xml sd/uiconfig/sdraw/toolbar/standardbar.xml starmath/uiconfig/smath/toolbar/standardbar.xml sw/uiconfig/sglobal/toolbar/standardbar.xml sw/uiconfig/sweb/toolbar/standardbar.xml sw/uiconfig/swform/toolbar/standardbar.xml sw/uiconfig/swreport/toolbar/standardbar.xml sw/uiconfig/swriter/toolbar/standardbar.xml sw/uiconfig/swxform/toolbar/standardbar.xml Change-Id: Iac0c7e8e474e8d217ca4daf47232019c64ca888f
2013-05-27Resolves: #i120158# fix picture shadow lost after saved as doc in some caseLei De Bin
Reported by: Yan Ji Patch by: Chen Zuo Jun Review by: Lei De Bin (cherry picked from commit fe549458ef04384ba777e4a36f34b68efc5b8b6d) Conflicts: filter/source/msfilter/msdffimp.cxx sw/source/filter/ww8/wrtw8esh.cxx Change-Id: I863ea7193f3dee563a892a6d857ee2385f58a862
2013-05-27testcase for bfb93ffc6d72d22a833acf9d8c9d166153dad7c0Miklos Vajna
Change-Id: If61739d54cb2572f20b118a2cf56ab2bd0f306e5
2013-05-27Include frmatr.hxx instead of directly format.hxxStephan Bergmann
...as otherwise this can result in "inline function [...] used but never defined [-Werror]" for SwFmt::GetULSpace and SwFmt::GetLRSpace. Change-Id: I9de3422953b38c978af1e7d2fc07398b83236ed6
2013-05-27Fix fdo#64685 - Superscript broken in masterKhaled Hosny
After f22006dc6ac34a35a060e15466cf6b2d2058617d the position member of SwDrawTextInfo is no longer a pointer, so changing the passed Point after calling SetPos() has no effect, but some code seems to be relying on it being pointer. Moving SetPos() to after changing the point seems to do the trick, but there may be other similarly broken code like SwSubFont::_DrawStretchText() below. Change-Id: I2f563c1543ff7bff68e573f69fce39694181b370 Reviewed-on: https://gerrit.libreoffice.org/4032 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-05-27sw: unused includes in atrfrmMiklos Vajna
Change-Id: Ia57b28ed60ca8c9a4b00009c2abf1e2ba2f8ed92