summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
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
2013-12-03DOCX import: declare wps as a supported featureMiklos Vajna
This means in case we hit an mc:AlternateContent element, we will read the mc:Choice branch of it, in case wps is the required feature, not the mc:Fallback one, which contains the information in VML format (after a lossy conversion). Change-Id: I476156bd1a39927dda903d14540155d1e62a211e
2013-12-03SwAccessibleFrameBase::Modify(): avoid accessing deleted mpFrmMichael Stahl
In ~SwDoc when a SwFmt is deleted, SwAccessibleNoTextFrame::GetNoTxtNode() would access the mpFrm which at that point was already deleted too; avoid that by returning early. This can be reproduced by closing the bugdoc from fdo#71450. Change-Id: Ide4d42511ccad116fa0362c23ced299d8430d08a
2013-12-03sw: valgrind complains about uninitialized mbIsPrepareSelAllMichael Stahl
Change-Id: I5405a6818fc63c3e29bb189858fd0abc73f67e43
2013-12-03sw unit tests: Introduce hasProperty(), make the redlining check more elegant.Jan Holesovsky
Change-Id: I123bdfd7f21b78cbee6db2ceb9b98c2e473415d1
2013-12-03filter: handle ooxml shapes in EscherPropertyContainer::GetCustomShapeType()Miklos Vajna
The problem was that the shapes produced by the drawingML import had types like ooxml-triangle, and EnhancedCustomShapeTypeNames::Get() only handles VML/binary MSO shapes (e.g. isosceles-triangle). Add an OOXML mode, and in that case use msfilter::util::GETVMLShapeType() instead, and only fall back to EnhancedCustomShapeTypeNames::Get() if necessary. Change-Id: Ic93ba4719133dd3e96c17d2562642a03e559fefa
2013-12-03convert callers of SwIndex::GetContent from xub_StrLen->sal_Int32Noel Grandin
Change-Id: I542399d3ed3a3b42592bcabb70d7034b3a4cc93c
2013-12-03convert xub_StrLen->sal_Int32 in edtwin.cxxNoel Grandin
Change-Id: Idbfeb4180cca90724eb1ce658629d58eed48bb5e
2013-12-03convert SidebarWinKey from xub_StrLen->sal_Int32Noel Grandin
Change-Id: Ie0e9176d4f8bbe5bdada5fea848ca9638fc55c91
2013-12-03convert SwTxtNode::GetLang from xub_StrLen->sal_Int32Noel Grandin
Change-Id: I2740622a5e30916d050e01350208a0de268e42ac
2013-12-03xub_StrLen->salInt32 in lcl_HighlightNoel Grandin
Change-Id: I0bcb31a37b642482885379fb2b64ed61c584272e
2013-12-03convert xub_StrLen->sal_Int32 in SpellStateNoel Grandin
Change-Id: I78ea405e27050015769bd17fee6c5221c694bae9
2013-12-03convert xub_StrLen -> sal_Int32Noel Grandin
Change-Id: If8f3c32f1e7664ceb266341a407aa29effa25ced
2013-12-03fix spelling delimeter -> delimiterNoel Grandin
Change-Id: I12a330e922f8f6ffe9c746a26e5b32c0bbae626a
2013-12-03convert FN_PARAM_MOVE_COUNT from SfxInt16 to SfxInt32Noel Grandin
so that we can convert surrounding code from xub_StrLen to sal_Int32 Change-Id: Ib779c82a71405f855cfe72bcde2511e8153445f0 Reviewed-on: https://gerrit.libreoffice.org/6896 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-02fdo#71749: sw: WW8: don't loop on tables in footnotesMichael Stahl
(regression from ee1db992b98378b5e2f5e9aa8af0e36c375e582f) Change-Id: Id10b6fb8e9e3697b10a1df605cb48d94a55ad207
2013-12-02Move functions to right file, prefer sal_Int32 to sal_uInt32 as indexMatteo Casalin
Change-Id: Ie5dca349acf2e163fdb6a47b0ba7af27220f2b2d
2013-12-02Don't obscure local function calls with #definesMatteo Casalin
Change-Id: I8a0851fac3e77f1ad101a422191bf80bfea7eafe
2013-12-02xub_StrLen to sal_Int32Matteo Casalin
Change-Id: Ie2c18baa3ab6a3a7c6f2ac83b6d2d5bd8ecf5811
2013-12-02xub_StrLen/unsigned to sal_Int32Matteo Casalin
Change-Id: I6d89f19ef2ee3aa83f3e74a416c41cd42dd448fa
2013-12-02xub_StrLen to sal_Int32Matteo Casalin
Change-Id: Id00f298c638b14b0e78b898373978f94b43804d9
2013-12-02xub_StrLen to sal_Int32Matteo Casalin
Change-Id: Ifd4f78d422eb3ed04407e9c9edb30ef319cae2cb
2013-12-02typo: intarnal -> internalAndras Timar
Change-Id: Ib7803de02d41440668b1e7410dfe0fa40ca2a536
2013-12-02Revert SwAccessibleCell::getCurrentValue to return a numeric value againStephan Bergmann
76c549eb01dcb7b5bf28a271ce00e386f3d388ba "Integrate branch of IAccessible2" had changed it to return a string, but that neither matched the documentation of css.accessibility.XAccessibleValue nor did it satisfy JunitTest_sw_unoapi. This needs further clarification apparently. Change-Id: Ib09f7549db7ba5155798d5917908c7ce50e7a592
generated by cgit (git 2.34.1) at 2024-08-13 02:58:57 +0000