summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2013-12-09drawingml import: handle w:b (found in docx groupshape textboxes)Miklos Vajna
Change-Id: I105d068a6b8d454fac963cd30f6f812cf2b96170
2013-12-09drawingml import: handle wps:bodyPr inside a groupshapeMiklos Vajna
Change-Id: I1f059ae653ab13a7c867f77b2b1b4265e9e71b4e
2013-12-09drawingml import: read w:colorMiklos Vajna
Change-Id: I6ae7ea8b58e262e5b6226f8f789e39ebcc6077ca
2013-12-09fdo#72488: Broken text when showing visible spaceKhaled Hosny
Turning on showing nonprinting characters replaces the space with bullet character, but still draws the text with the original kern array, this works fine until there are ligatures involving the space character as the number of glyphs after replacing the space with the bullet will be different and the kern array will be completely off. This is a hack that gives up on replacing the space with a bullet when its width is zero, not sure if it would interfere with other legitimate uses. Change-Id: I5ed17132ead7cd141a4e8b0372e37541c163be30 Reviewed-on: https://gerrit.libreoffice.org/6995 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-09RTF export: unused forward declarationMiklos Vajna
Change-Id: Ida8e4d9e9b6ea7e1009b8cf617363d31e895a5a2
2013-12-09abi#10201 RTF export: fix crash when handling table::BorderLineStyle::NONEMiklos Vajna
Change-Id: I811820c0d550ce24ad2180a8917ef0087968c30b
2013-12-09Fix for Column Break if it appears in w:r which is not the first run.Vinaya Mandke
Explicitly ended paragraph when the column break appears in a run (which is not the first run in the paragraph), as Writer adds a column break only for new paragraph. Also the created paragraph must have the same para properties as the earlier one. Hence avoided pushing new para properties if paragraph is split to adjust a col break. Added UT for the same. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/6953 Change-Id: If7d503b7a4bfab31f40ceb0119876e5909252b2f
2013-12-08put comment for the previous patch.Faisal M. Al-Otaibi
Change-Id: Id9cee84530d00d6d2528d038464e885e1286dfe5
2013-12-08docx: fdo#44029 export the right alignment when locale are RTL.Faisal M. Al-Otaibi
Change-Id: I771eb0d0a90816f0c4cbd66cfcb755f67455bb9b
2013-12-06sw: fix more cases of SwDrawTextInfo::GetText()/SetText() not restoringMichael Stahl
Change-Id: I9625958e4139dd595f269ebac72b9a037118a9f5
2013-12-06fdo#71714: sw: fix small capitals renderingMichael Stahl
So f22006dc6ac34a35a060e15466cf6b2d2058617d changed the SwDrawTextInfo to contain not a pointer but an actual OUString, and then d908422f5763ed8ea79af81336ca564f46435baf changes SwSubFont::DoOnCapitals() thus: - const XubString& rOldText = rDo.GetInf().GetText(); + const OUString& rOldText = rDo.GetInf().GetText(); rDo.GetInf().SetText( aTxt ); That used to _copy_ the string, but now it just references the member, and so the SetText(aTxt) below overwrites rOldText. Change-Id: I06d7ee7084c15d88b3e748ef18877b62e79bdd0e
2013-12-06sw: remove unused zorder data from bugdocsMiklos Vajna
Expecting that the shapes are on the drawpage in the same order as they are in the file and providing zorder info at the same time doesn't work. Either using names is required or the simpler way is not providing zorder info. Fixed earlier bugdocs not to provide zorder info, so when zorder will be handled, these tests will still work. Change-Id: I771b0574eba489322998c84a60d5acb94fd09189
2013-12-06DOCX import: fix import of wpg shapes after a wps textframeMiklos Vajna
Change-Id: I30844062bf4d4f15ca70d9f441f0505fa4f26bb7
2013-12-06DOCX import: fix relativeFrom=page, align=right handlingMiklos Vajna
Change-Id: I9c1df594457a8ccbbebf4ede61cc3a637ecc7023
2013-12-06DOCX import: handle groupshapes inside wpg elements (groupshapes)Miklos Vajna
Change-Id: Icb44f91219f75103f469f38f96d843b8e8251e92
2013-12-06fdo#71784: Invalid Sections getting added to the document after RTTushar Bende
Description: There was a problem for some documents, during export Invalid sectPr were getting added. The root cause was faulty calculation of PageDesc value. This was the reason for increasing number of pages in RT doc. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Change-Id: I0700c735545614730d26be187d9047fd20ebf134 Reviewed-on: https://gerrit.libreoffice.org/6813 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-06Default OMultiTypeInferfaceContainerHelperVar equalImpl parameterStephan Bergmann
...and assorted OUStringHash clean up Change-Id: I779904e1275e8df88f567beb388d1d11af9e9671
2013-12-06Santa Claus brings fixed background color of textframes in drawingml importMiklos Vajna
Change-Id: Ie2b6885aae5e26c3d29d372da730837cb7dc97ce
2013-12-06fdo#71784:Preserve prop "allow row to break across pages" during exportTushar Bende
Description: If in original doc for table if "allow row to break across pages" is checked then during export it used to write <w:cantSplit w:val="false"/> in trPr which was causing problem that all the cell data was getting displayed on same page. Change-Id: I5a20976ca91099de191eb1e2a7290b96dcdc6777
2013-12-06Get rid of DECLARE_STL_USTRINGACCESS_MAPStephan Bergmann
Change-Id: I00d02eaeff3eaa5f49550eb9c1d4e4e7e0b2203c
2013-12-05fdo#71866: sw: un-break index updatesMichael Stahl
SwTOXBaseSection::GenerateText() wants to operate directly on SwTxtNode::m_Text and accepts no substitutes such as a temporary string on the stack; this regression shows that developers often significantly underestimate the craziness of the existing code. (regression from d6e321f8264188ce8371c060ebeb75b213f0c90f) Change-Id: I01b831f35a52bde207a7db8cae9d4aadb826b2d8
2013-12-05fdo#71892: sw: fix crash when pasting table in footnoteMichael Stahl
The code that updates RSIDs assumes that the number of nodes copied is the same as the number of nodes inserted, which is not true when pasting a table into a footnote because Writer can't do that, hence all table nodes are missing. Count inserted nodes instead. (regression from 062eaeffe7cb986255063bb9b0a5f3fb3fc8e34c) Change-Id: I77b5b7751d1036a6401f708532537d874969502e
2013-12-05Get rid of comphelper::UStringLessStephan Bergmann
...default std::less<OUString> is just fine. Change-Id: Ib9d3c10f2817d757f3c19eb3d4607095883af91a
2013-12-05DOCX import: never call lcl_start/endElement if handling mce elementsMiklos Vajna
The problem was that after handling the mce elements (AlternativeContent, Choice, Fallback) we still invoked the lcl version of these methods and this resulted in duplicated properties in the dmapper, finally resulting in incorrect position of the textbox. Change-Id: Ib581162cba703fc1e2e44c1a9e63358891d6f78c
2013-12-05Avoid multiple definitions of two lovingly copy-pasted functionsTor Lillqvist
Multple external definitions of a symbol causes problems when linking statically, as for Android. Just make the functions static for now, as they are only used locally in the files where defined anyway. Change-Id: I8ddbaf01497c171bed4e15f6183ba43461c672d1
2013-12-05DOCX import: declare wpg as a supported featureMiklos Vajna
This is the same as wps, just for group shapes. Change-Id: I321b19ed538a6cb8f9068c7de6fbe9a8eb0bd82f
2013-12-05RTF: use "InsertMode" insead of "IsNewDoc" for consistencyMichael Stahl
... with other filters. Change-Id: I563d6f7713d882b834978699c492a43a70e072cd
2013-12-05fdo#68724: sw: fix crash on Insert->File with Hybrid PDFMichael Stahl
This is an unfortunate combination of 2 special cases: - the Hybrid PDF has its own XFilter implementation to extract the embedded ODF document - Writer needs to create a SwReader with SwPaM for Insert Since the PDF XFilter uses a special service in sfx2 to implement the import, handling this requires a new method in SfxObjectShell that calls back into Writer to create the properly setup SwReader. Change-Id: Ie85f3bfa322bfe883c479e1cb198a8bf0cbbac23
2013-12-05cp#1000017 DOCX/RTF import: avoid fake tab char in footnotesMiklos Vajna
Word wants this, so it's added by the exporter to the document, but on import we should ignore it. Change-Id: Idcb669ba624bf462a50a85eb4aacf397afb6efe6
2013-12-05Partly revert "Appears SwView::SetMoveType no longer really does anything"Stephan Bergmann
This reverts most of commit a50a2111a31e4d9dd5e2659a146e9de8e292de75, where the -Werror,-Wunused-variable for SwView::SetMoveType's aColor (after 3e8fe4d8e19be2ccd8f5bb898530e2f615a90321 "Remove the Navigator buttons below the scrollbar in Writer" had removed its use) had erroneously make me think that SwView::SetMoveType now effectively didn't do anything anymore, failing to note the m_nMoveType = nSet; part that was still relevant. Change-Id: I5e43886806533e80e238fef8d836e09e28209b6d
2013-12-05-Werror=uninitializedMiklos Vajna
Change-Id: I3ad9cad8a19eceec1b6a86a0210f4a6d0fa9bf0b
2013-12-04fdo#64232: Unit test for font theme attributes preservationJacobo Aragunde Pérez
The unit test checks three cases: * attributes in run properties * attributes in default run properties * attributes in style definitions Change-Id: Ie3224f41bd29e8b258dbd6823b7c9549e1ef5b1e
2013-12-04fdo#64232: Save font theme attributes in rPrDefaultJacobo Aragunde Pérez
The default values for run properties are stored in the styles.xml file, in the <w:rPrDefault> tag. The process of this tag is slightly different from normal <rPr> tags. First, we fix DocxAttributeOutput::OutputDefaultItem to be able to output the contents of the character grab bag. Second, we fix StyleSheetTable::applyDefaults to read the property values using the GetPropertyValue method instead of using an iterator directly, because the former creates the grab bags and returns them as properties while the latter returns all the properties individually, including those that should be inside a grab bag. Change-Id: I91254ba20fd9ca5a1b02afb587f52a449a215d6c
2013-12-04fdo#64232: Fix and preserve eastAsiaTheme attributeJacobo Aragunde Pérez
The attribute eastAsiaTheme was not being processed properly (the derived theme font was being assigned to complex-script instead of eastAsia), so this patch fixes that and it also preserves the value of the theme itself. Change-Id: I1a91ab2080eb2bc79f41fda9ae4bf7afb05f69a3
2013-12-04fdo#64232: Save font theme attributes back to the docxJacobo Aragunde Pérez
Font theme attributes were saved to an InteropGrabBag on import, and they have to be saved back to the document when exporting to docx. If the user modified the font in a text fragment during edition, the theme attribute should be discarded in favour of the font attribute. The attributes in the grab bag are processed in the last place so we can compare the font attributes with the original fonts to know if they have changed. Change-Id: I2502b4aa96213e74b46fccd1a20f99421f7cf98b
2013-12-04sw: add CharInteropGrabBag uno property to charactersJacobo Aragunde Pérez
Change-Id: I2c6d8b1e4ef6df6a6662d5db89e67e5fba3c6ade
2013-12-04sw doc model dump: show rsid valueMiklos Vajna
Change-Id: Ic657c4bae045a2663c3b10c569af2fd0c9235775
2013-12-04use OUString::startsWithStephan Bergmann
Change-Id: I248e2e5802ef2404c49fc7bc4c9f4baa794ccdef
2013-12-04DOCX drawingML shape import: always set OpaqueMiklos Vajna
If behindDoc was 0, we did not set Opaque, so it went into the background, fix this. Change-Id: Id5aa683ffb388b1f4de33dcb19559729db5a4e02
2013-12-04drawingml import: don't set CharEscapementHeight unconditionallyMiklos Vajna
Commit 840a8573c8cebe67ddd3c9fe106c7dbd789bb334 (Fix fdo#70220 Superscript not imported from pptx., 2013-10-07) made it possible to set CharEscapementHeight even if moBaseline is not set, but this causes problems in the docx importer + not necessary, according to the bugdoc; so just don't do that. Change-Id: Ib95ac449bd8fdf6376261ddc86108f0d23f2200e
2013-12-04Relater: rhbz#903281 NULL follow frames on drag/dropCaolán McNamara
Change-Id: I50319fb218518edd23ff8c859c355265595050d6
2013-12-04DOCX import: parse drawingML group shapes in oox onlyMiklos Vajna
This is similar to commit d5c934d150cb6cea5f96cbbee4fb5e8312bf027e (n#792778 DOCX import: parse group shapes in oox only, 2012-12-14), except that was for the VML importer. The only difference is that in case of drawingML, OOXMLFastContextHandlerShape::lcl_createFastChildContext() is only called for the children of the group shape, not for the element itself, so compare against the start token, not the current element. Change-Id: Iddeabb20bbd5f0153e2fc4e6df463830126fdd37
2013-12-04remove unnecessary inline keywordCaolán McNamara
Change-Id: I00a0c94dd9131be3969e2cfd1320682774dced3f
2013-12-04SwRTFWriter: fix string conversionMiklos Vajna
Regression from 02bfed8a53556badfea637930b05d923cf9465f2 (convert sw/source/filter/ww8/*.cxx from String to OUString, 2013-10-14), check for string length before invoking OUString::operator[]. This can be reproduced if copy&pasting some text inside a Writer doc from normal text to rectangle shapes inside group shapes. Change-Id: Ia8f774b27ca63773792e6af913dfe7e493bea4b8
2013-12-04fix SwInterHyphInfo commit againNoel Grandin
The original commit was eb56848029a3b26a9d4f07a55364749e9e7d8339 "convert SwInterHyphInfo from xub_StrLen->sal_Int32" My first attempt at fixing the commit was a073e81c3acb0c4aa3bc4fde146b6eb9869738e1. This is the second attempt. Change-Id: I030c0a3107e1321006744473efe3ca3341251ad4
2013-12-04fix SwInterHyphInfo commitNoel Grandin
fix for commit eb56848029a3b26a9d4f07a55364749e9e7d8339 "convert SwInterHyphInfo from xub_StrLen->sal_Int32" Change-Id: I197edf7d5558cd44200f8f04ba29f028fba25639
2013-12-04convert SwInterHyphInfo from xub_StrLen->sal_Int32Noel Grandin
Change-Id: Ie5a877fb90c360506f05d0417524966e137e5d77
2013-12-04convert xub_StrLen->sal_Int32 in doctxm.cxxNoel Grandin
Change-Id: I0981631d516e18c065c3f5fcc1a049119b47ec76
2013-12-03longparas: convert GetTextBreak to sal_Int32Caolán McNamara
Change-Id: I693e4c9916e1968c33ebd922829662f6efc27bfb
2013-12-03DOCX drawingML groupshape import: fix relative positionMiklos Vajna
Change-Id: Ice07f423707b48a013a9b6325b11f88206c38e60
generated by cgit (git 2.34.1) at 2025-01-02 16:18:47 +0000