summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2015-04-22Various #include <sal/log.hxx> fixupsStephan Bergmann
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it. Cleaned up some, but something like grep -FwL sal/log.hxx $(git grep -Elw \ 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF') -- \*.cxx) shows lots more files that potentially need fixing before the include can be removed from rtl/string.hxx and rtl/ustring.hxx. Change-Id: Ibf033363e83d37851776f392dc0b077381cd8b90
2015-04-22DocxAttributeOutput::m_postponedDMLDrawing: use std::unique_ptr<>Miklos Vajna
Change-Id: I0125467bad9be48ce8daa1fda32c731d8ee96b40
2015-04-22WaE: Unreferenced function definitionTor Lillqvist
Change-Id: I0f9d7374de59a916871677c08144bf79b39068dd
2015-04-22WaE: passing 'class OUString' by value, rather pass by referenceTor Lillqvist
Change-Id: I744425e079c426745e02056153707675311e58ca
2015-04-22Theme panel to change color/fonts of current stylesTomaž Vajngerl
In a theme panel the user can change / replace the styles font and colors used in some predefined style elements (for example Heading). This is "fake" theme support and not the same thing that MSO uses, but it still can be useful for the users to change the appearance of the document. This is the initial commit of the work and will be much extended. Currently it is only available when experimental mode is enabled. Change-Id: I8d34ce87d21975ec6020ac45ecaebb0701b63b2a
2015-04-22add "Style Presets" sidebar panel (experimental) to writerTomaž Vajngerl
Style presets is a list of bundled & user defined styles presets that can be applied to the current document. The styles are taken from tempalte files that are in "styles" template folder. This is for now only added as an experimental feature. Change-Id: If6d1128ca7e2f61efd13bb8ae3baee5cb357d286
2015-04-22tdf#90766: Table - keep with paragraph setting is brokenZolnai Tamás
Modify input set before dialog is created Change-Id: I66d9ed5c07fcdfe4841d071be9b5252aa925b987
2015-04-21loplugin:cstylecastStephan Bergmann
Change-Id: I9dfde74fa7e5e3a651ea014e6cc335bac780cb4b
2015-04-21sw: assert that SwField::m_pType is not nullMichael Stahl
Change-Id: Ifb59810b11db05f4fbbd815ff00efc70cfac03af
2015-04-21sw: prefix members of SwValueFieldType/SwValueField/SwFormulaFieldMichael Stahl
Change-Id: Ibadb4fb3a56c271bb045790ea0544bfa35b327b6
2015-04-21sw: prefix members of SwFieldMichael Stahl
Change-Id: If81d5a2ab499837f9e4a38665b0daf2a6bba1269
2015-04-21sw: prefix members of SwFieldTypeMichael Stahl
Change-Id: Ib07a3c15cb48998d0acb5bfae4e902a2d729b648
2015-04-21tdf#90421 RTF export: ignore hyperlinks without an URLMiklos Vajna
Commit fe444d1f74abe417962be0bcd3340f40f2446b58 (fdo#62536: sw: fix AutoCorrect bold/underline on existing AUTOFMT, 2013-06-20) adds an empty inet format hint on the text node during autocorrection, on export we can safely ignore that to provide well-formed output. Change-Id: Iafae941a13e29dcc7d8b4bade5ce94a486b59638
2015-04-21SwTxtAttr::dumpAsXml: show hyperlink URLsMiklos Vajna
Change-Id: Ie887db2793a8bc85a6cd381db7543436bbd5a9d5
2015-04-21Applies CharAttribute to selected text and tests undoAustin Chen
Change-Id: Ibd171fda4ea38de4d76d8f252d6f6d37cf3b9a66 Reviewed-on: https://gerrit.libreoffice.org/15158 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-21tdf#39547 Image title/description is lost after changing anchorNiklas Johansson
This issue has been present for a long time, at least since 2010. When the old frames are deleted the SdrObjPlusData that holds the title and description is deleted as well never to be transferred to the re-anchored object. Some types of frames only have the msTitle and msDesc so let's keep them updated and also use them to transfer the strings in question to the new SdrObjPlusData object. Change-Id: If9b00b70d2556bd32fa2b4f312db4ad09102d9ee Reviewed-on: https://gerrit.libreoffice.org/15194 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-21RTF import: handle d{x,y}WrapDist* picture propertiesMiklos Vajna
Commit e789c7f0f15a6b571de95b81e77e3a323e9f540e (RTF import of d{x,y}WrapDist* shape properties, 2013-04-09) added support for wrap distance of shapes, but that was ignored for shapes, as dmapper later overwrote the set margins. Fix this by generating the expected tokens in case of pictures, then dmapper will take care of the rest. Also add testcases for the original shape wrap distance feature that was missing. Change-Id: I6f219ee6fef71328368409d142897dbae77a0f2f
2015-04-21silence the warning from GetAssignedOutlineStyleLevelCaolán McNamara
Change-Id: Ib55cb1982ed279bc3941eef58f894262b6687830
2015-04-21tdf#78606: unittest for docx section header export bugEilidh McAdam
Checks that header is exported to DOCX when section is first paragraph. Change-Id: Ie8db2a372754208203f0df62137a3a0c3bbf39b9 Reviewed-on: https://gerrit.libreoffice.org/15370 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-21tdf#78606: Write DOCX header even if section is first paragraphEilidh McAdam
Header flags are now set prior to export if a section is the first thing in the document (ODF -> DOCX). Change-Id: I84ba61c11da78a012938163d986ee5fcd301d405 Reviewed-on: https://gerrit.libreoffice.org/15369 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-04-21StyleManager & StylePreviewRenderer + common implementationTomaž Vajngerl
StyleManager is a new class responsible to handle document styles. The current implementation has only the responsibility to provide a implementation of StylePreviewReneder, but the idea is to move all style related functionallity to this class (and relieve the SfxObjectShell a bit). CommonStyleMAnager is the common impl. StylePreviewRenderer is responsible to render a preview of a style. As styles can be handled differently by each component it is possible to provide component specific StylePreviewRendered, but currently only the common one is implemented and used by sw. Change-Id: Id271485f571a777a3e94f855d3c614a2efc14628
2015-04-21sw: ODF import: frame background: do not override gradient transparencyMichael Stahl
... with style:background-transparency (regression from 102bb87ca1a5dee3a09442bf503a54bb703c79ea) Change-Id: Icead7a47c145eace51249896b6e05d65dfaa2f78
2015-04-21tdf#90640: sw: ODF import: ignore style:background-transparency forMichael Stahl
... bitmap backgrounds of frames. OOo/LO versions <= 4.3 wrongly write fo:background-color="transparent" style:background-transparency="100%" for bitmap backgrounds, because of a stupid API implementation with SvxBrushItem. They overwrite that with draw:opacity="100%" on the child element style:background-image, which we don't read if we see draw:fill attributes, so ignore the background-transparency in that case. (regression from 5aa360cae0383f270c12708e7e94179a7fde6711) Change-Id: I4ca59d8932a8e5d034c35543a54528198ad7d51c
2015-04-21tdf#90640: sw: ODF export: be consistent when exporting RES_BACKGROUNDMichael Stahl
The emulation of legacy RES_BACKGROUND properties claims that (unless fillstyle is NONE) all of them are direct values, which causes export of legacy attributes like style:background-transparency without corresponding non-legacy draw:opacity. Especially problematic for style:background-transparency, which is set to 100% if style is bitmap, which is the reasonable default for API backward compatibility of BackColorTransparency, but wrong for ODF. Change-Id: I1fa4fa5df45eb00cbfcd2e171b4862c4e195cc7d
2015-04-21tdf#90640: sw: ODF export: fix wrong property types in FILL_PROPERTIES_SWMichael Stahl
Wrong type causes draw:opacity not to be exported from FillTransparence. (regression from 6e61ecd09679a66060f932835622821d39e92f01) Change-Id: I478fc34dfb614f0433a6e28b0260379528b86680
2015-04-20sw, writerfilter: these 'using namespace' statements can be avoided easilyMiklos Vajna
Especially the 'using namespace std' is scary, now that we have std::shared_ptr and boost::shared_ptr, too. Change-Id: Ibb584281f1b9d56103ab5984473eb484157c12d5
2015-04-20Related: tdf#90681 table model can have truly empty cellsCaolán McNamara
this time the missing cells are on the left Change-Id: I55a5aa60c8d06b25b0c48b3f6a683694adca8e6a
2015-04-20tdf#80708 RTF export: fix unexpected table row breakMiklos Vajna
Regression from commit 1f77a5e8d5bf8a7f1b7bd7206996d2b2efc59462 (n#203704 fix RTF export table output for subtables, 2012-02-08), the problem is that RtfAttributeOutput::StartTableRow() has two callers depending on if it's the first or a later row, but the m_bTableRowEnded flag storing if that method is called is only set in one case. Fix the problem by moving the update of the flag to the method itself. Change-Id: Ieae1fb53f9528fc74d037d2fd783b3979b17cab8
2015-04-20Clean up new rtl/surrogates.hStephan Bergmann
Change-Id: Iec781bdbbf216cb14c9ba5be5955123273d7699c
2015-04-20fix crash on export of abi9702-1.doc to docxCaolán McNamara
Change-Id: I3c0d7560d9a47123ca98f72c0319fcee97894913
2015-04-20sw: prefix WW8FormulaControl membersMiklos Vajna
Change-Id: Idf747fb895c15e8df96a6ced06cf9f0df5d35e39
2015-04-20sanitize strings with invalid high/low surrogate sequencesCaolán McNamara
Change-Id: I9ad1aa651b6971526dd924630fe5606b7632f2dc
2015-04-20fix buildCaolán McNamara
Change-Id: Id9fad922622881d29664d2149b74c98742a4e88d
2015-04-20RtfAttributeOutput::ParaHyphenZone: use \hyphparMiklos Vajna
Previously SvxHyphenZoneItem was serialized to some custom RTF extension that even our own RTF import ignores since LO 3.5. Change-Id: Ia99d9750ad0b1a07105eeef2bee07e6fdbfe7876
2015-04-20convert SEARCH_OPTIONS constants to scoped enumNoel Grandin
Change-Id: Id0f0c7d692410cf5e1477c5180e7cfb8e7b0f52b Reviewed-on: https://gerrit.libreoffice.org/15345 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-04-19add test-case for EDB-36788Caolán McNamara
Change-Id: I727f0bcee5c506fd524ff1b1b6f9de5f012bed20
2015-04-18testOldComplexMerge: work around buggy libxml by not using //Miklos Vajna
Change-Id: Ia53d7a2aba039386cafcf8d0030c9e768c08b743
2015-04-18silence MacOSX_37-tdf-buildbot failureCaolán McNamara
Change-Id: I2b23d406463168f010c8f2d48889a5a0ff15895c
2015-04-18fix export to rtf of ooo87305-1.odtCaolán McNamara
fold DocxWriteTable into SwWriteTable and make the same improvement to the rtf filter as the docx filter to keep the table writer in sync with the current table, and mirroring the cache improvement of the docx filter into the rtf one Change-Id: Ia0d5972acbe6524da67497defdcbcd26cfdc44fb
2015-04-18loplugin:implicitboolconversionMiklos Vajna
Change-Id: I5c74d150d5e7e35ef9512e6f07bf370c521b0fec
2015-04-17Resolves: tdf#90681 table model can have truly empty cellsCaolán McNamara
old school complex tables can create a table model where a cell exists in the table but there are no paragraphs in it. -------- | A | C | ---- | B |*D*| -------- i.e. normally for the above there are 4 nodes which get exported, even though C and D are merged. But it can be the case that there are only three nodes, and *D* is missing be conservative for now and only do this for the obviously broken no cell start but cell end case and incrementally build up the test-cases Change-Id: I5703595f61688a66b7fac7f3905ace0c207c9875
2015-04-17SwTableLines::size is an unreliable way to count rowsCaolán McNamara
pathological old-school writer tables can have one line here for merged rows The table writer knows about these things, so use that, keep it up to date, and make that up to date cheaper to do Change-Id: I3433206a54c7cb096b699ac0b61653358e647115
2015-04-17RTF filter: export \hyphautoMiklos Vajna
Change-Id: Ide8cb5f45d3eb60c45d86d58a9ab12bbc9f4cf47
2015-04-17fix crash on export of ooo103108-1.odt .docCaolán McNamara
stop pDel->Cut from deleting the pLastFtnFrm that we still need Change-Id: If5dc507ea58c613a581c0528160adaa5ca5364f3
2015-04-17get the vertical span from the reliable getRowSpansOfRowCaolán McNamara
unstead of the unreliable pTblBox Change-Id: I083560fdbcf83173c5f3c42267ca2d8e4e6d9a17
2015-04-17incredibly dubious hunk of codeCaolán McNamara
from commit 0415e2696156b25226f21085a0716187f83c2f4b Author: PriyankaGaikwad <priyanka.gaikwad@synerzip.com> Date: Thu Feb 27 17:42:52 2014 +0530 fdo#73219 File corruption: Table in header Description: File corrupt due to the end tag </w:tc> </w:tr> </w:tbl> are missing after roundtrip in header4.xml Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/8378 Change-Id: Ib05a50b3b3beca6c744b93360f9341ddcaa1a22a Change-Id: I93ecadf7bfd2d19da33611e82ba95c4106bda2a5
2015-04-17loplugin:implicitboolconversion clean-upStephan Bergmann
Change-Id: I049b2eec5b2201f4056bb6e7b9b97e7763e5e214
2015-04-17SvStream: WriteUChar -> WriteBoolStephan Bergmann
Change-Id: I89aa0e22c31d368ab36fe46917db6aacb11c7b14
2015-04-17loplugin:implicitboolconversion gold?Stephan Bergmann
The code was like that ever since 84a3db80b4fd66c6854b3135b5f69b61fd828e62 "initial import" but looks very much like the intent was to make the conditional operator bind tighter than the less-than operator. Change-Id: I810aa5dc56f02e98111f4879db50c59a9b69b8d6
2015-04-17refactor a tiny bit for future plans, no change in logicCaolán McNamara
Change-Id: If104cdbc7e9d38c9664492f433c53ee5ffb59578