summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2012-09-24de-duplicate SwNodes::TextToTable()Michael Stahl1-145/+116
Change-Id: I8a61b67cb5bd1333c05f9a98c7af6e3ed05c8fd0
2012-09-24rhbz#820283: fix crashes in DOCX table import:Michael Stahl1-0/+14
It is apparently possible that writerfilter creates a table with irregular structure, where the lines have varying numbers of boxes in them. This may cause crashes on later editing operations, e.g. when SwTable::NewInsertCol() is unable to find boxes covering a particular column. To prevent this, add missing boxes in SwNodes::TextToTable(). Change-Id: I423821645baeaf55595e4933e1ab8fb89b2099f3
2012-09-24tweak assertions in SwTable::CheckConsistency()Michael Stahl1-13/+21
Change-Id: Ib06543b7e59694f240b2b5fadcd6b464ce9e5792
2012-09-24refactor code with <algorithm>Takeshi Abe2-19/+6
Change-Id: I774492928a909a0768ebcdc9cb56651146659351 Reviewed-on: https://gerrit.libreoffice.org/677 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2012-09-24Remove unused member SwDoc::pMacroTableArnaud Versini2-4/+0
Change-Id: Ic09b960b675d674a16f7f252ed2a974c4e25505b Reviewed-on: https://gerrit.libreoffice.org/680 Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
2012-09-24fdo#49655 fix RTF import of text in the middle of table definitionMiklos Vajna2-0/+20
Usually table text comes after the \intbl control word, but it turns out text is allowed earlier. Make sure such text is buffered, otherwise we'll send paragraph / run properties to the dmapper in the middle of table properties, which is obviously not allowed. Change-Id: I34f1df7e171316a7d926179689627301860d492f
2012-09-24As far as I can see this function is unusedTor Lillqvist1-5/+0
Avoids duplicate symbol clash with the other function with an identical name and signature in sw/source/ui/uno/swdet2.cxx in the case of disable-dynloading. The IsDocShellRegistered() function used in sw/source/filter/basflt/iodetect.cxx presumably refers to the one in swdet2.cxx, as iodetect and swdet2 both go into the swd library, while fltini goes into the sw library. Change-Id: I2916f1698542679bf18abf9a7981fc32ef2d9829
2012-09-22sal_Bool to boolTakeshi Abe9-72/+72
Change-Id: I75936bc66b0621de5e62f8e3a35a38fa85dcfcef
2012-09-21fuck you, SIZE_MAX. you'll rue the day i find out which .h defines you.Michael Stahl1-4/+1
rue!!! Change-Id: I9e2b05180ba64d1617b33423ceffc19bc996e335
2012-09-21the intarwebs say it may be hidden in limits.h...Michael Stahl1-0/+1
Change-Id: I79bb1cf7777ae92982bc2909411ed4efd0d31352
2012-09-21sigh... include stdint.h for SIZE_MAXMichael Stahl1-2/+5
Change-Id: I714149f8cf800ea0021cc72a4bb50d840076da66
2012-09-21"a function call cannot appear in a constant-expression"Michael Stahl1-1/+1
Change-Id: Ic1aecfb1071033d8e134649506f72c17833a206a
2012-09-21use scoped_array in lcl_UnMergeMichael Stahl1-4/+3
Change-Id: I00c899612d499273725ff8071aff1c93c7d17327
2012-09-21little cleanup in GetTblSelMichael Stahl1-4/+2
Change-Id: Idd8639d2f017342ae0227a44b75680179ca376a4
2012-09-21fdo#48692: fix problems with large number of table cells:Michael Stahl22-156/+217
SwSelBoxes containers are filled from SwTableSortBoxes in various places, so adapt that to use size_t integers as well. Change-Id: Ia55f020bb9ada94bb22802d9adabb055a22edd2f
2012-09-21fdo#48692: fix problems with large number of table cells:Michael Stahl13-50/+69
The SwTableSortBoxes is now a STL container which can have more than 2^16 elements but unfortunately there are a lot of 16 bit integers used to index it all over the place, causing infinite loops and possibly worse problems; fix that to use size_t. Change-Id: I868ec9dd0629be4fbe4d6b8f294fb765e3d662ec
2012-09-21n#780563: Fixed table import in shapes table handler was missingCédric Bosdonnat2-0/+13
Change-Id: I7720cfc706d9612fcc1e8a53b13a31f22b91d99e
2012-09-21fdo#55187 fix DOCX import of unicode 0xNN0d when it's a separate runMiklos Vajna2-0/+9
E.g. 0x010d was parsed as a newline character... This also makes the RTF workaround from fdo#39856 unnecessary. Change-Id: I5e4a95b4436e1492b64961820702caace0a33e4b
2012-09-21fdo#52389 fix RTF import of paragraph without RTF_PAR at the end of the docMiklos Vajna2-0/+12
Change-Id: Ib7b48986d5b01c75ae0be8dd6618a2e8be2ae51c
2012-09-21Added unit test for 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dcCédric Bosdonnat2-0/+18
Change-Id: Ifb3216115e6d4ad8e3b40ab798ed438b7e502f47
2012-09-21n#779627: table empty cell para collapse fix with fly framesCédric Bosdonnat1-2/+2
Make sure that the collapsed empty cell paragraph is more important in FormatEmpty than anything else (fly frames are the onle case. Change-Id: Id88e3370e988b45eabe4b9b30628e5472e9db1fe
2012-09-21n#779834 testcaseMiklos Vajna2-0/+8
Change-Id: I13bc9452385fff1bdc2577ea000ba208206a2c32
2012-09-20sw: tweak previous comment translationMichael Stahl1-20/+20
Change-Id: Id4a89bd131f37b6844046803aae9b2f6e081af0d
2012-09-20fdo#39468: Translated German comments in sw/source/core/textgerhard oettl2-100/+94
Change-Id: I53a415e1ec573d342e06d0cf10bad6f8cb95b478
2012-09-20n#779627: fixed the collapse empty cell paragraphs compat optionCédric Bosdonnat2-11/+10
This option didn't work if the paragraph to collapse had an alignment or spacing defined. This fix was needed to properly import docx/doc files Change-Id: I6b3522905714fe3def7d87cd82cca84746310793
2012-09-20Sprinkle some staticness to avoid duplicate symbols when DISABLE_DYNLOADINGTor Lillqvist3-10/+10
Change-Id: I2d62eddb561baa28e320f7d89a8655d2806d7b10
2012-09-20sw: drop unused includes in unodrawMiklos Vajna1-18/+0
Change-Id: I2cae970f532c3441a7ec7c8318987ea343aaf1cd
2012-09-20introduce new option --disable-cve-testsDavid Ostrovsky1-1/+6
Change-Id: I288638c4a70396ccb7354b20e901aa0c46ffe442 Reviewed-on: https://gerrit.libreoffice.org/653 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2012-09-20sal_Bool to boolTakeshi Abe5-54/+53
Change-Id: Id29032b3f2f228141e37f713c798d61cc20584c0
2012-09-19SwCrsrShell::Combine: this can be assertMichael Stahl1-7/+6
Change-Id: Ia23804f213f80f4b31f1e31491dfc87d2d49f46a
2012-09-19rhbz#689053: fix crash following delete at last table cell:Michael Stahl1-7/+8
The IsSelOvr() in SwCrsrShell::Combine() detects that the PaM with mark in the last table cell and point ouside the table is invalid, but unfortunatley restores the wrong position, which does not actually correct the PaM; the deletion on the invalid PaM then removes the last SwTxtNode in the document, which leads to crash later. Change-Id: Ib2ae0b54e6c15dbe5b6811d8696531bf2022e1a4
2012-09-19SwHyphWrapper::bShowError is deadMichael Stahl2-10/+0
Change-Id: Ia9b8205a3b23fb98bf08d2d53aa82fdeda7785f5
2012-09-19DOCX ink testcaseMiklos Vajna2-4/+16
Change-Id: I0d38edfe1bac8a6db0227d9bbd0d9fbf9cdd93fd
2012-09-19RTF ink testcaseMiklos Vajna2-0/+194
Change-Id: I88ab87525945f81ad6e11756f43bc211f8d2b70a
2012-09-19remove apparently unused variablesLuboš Luňák1-2/+0
Change-Id: Ia3f971b065bf0fba361871cbed63833d76b462fe
2012-09-19ComponentContext::getUnoContext -> getComponentContext simplificationStephan Bergmann2-15/+1
...and some further clean-up. Change-Id: If5dce53e382b56390c502d0d0d93fc06cbfe33ea
2012-09-19n#778828 testcaseMiklos Vajna2-0/+17
Change-Id: I38ba0fd4128acfa114eac0b6b6e28ea49c335f0c
2012-09-18Modifying comments to meet doxygen standardsAbdulmajeed Al-Abaulrazzaq10-463/+463
Change-Id: Ibc60c20241b70492aaebcebccb738c7e11fdbb41 Reviewed-on: https://gerrit.libreoffice.org/638 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2012-09-18rhbz#852128: sw: avoid table undo crash:Michael Stahl3-3/+17
SwUndoTblNdsChg::UndoImpl: to prevent access of deleted table box start node, disconnect the SwTableBox from the start node before removing the table box nodes. This problem was probably introduced with CWS swnewtable db4de0817df6906db2743239d45f9f0834ab1e91, which changed the order of the removal operations for unknown reasons. Change-Id: Ic59823a84082cc6ff453b2b512cbb8253886ecf3
2012-09-18n#778148 sw: fix mouse pointer over urls with background imageMiklos Vajna1-1/+3
Change-Id: Idbc93dfc95dfefc4c962ef36e0557a717550b7d7
2012-09-18deprecate oustringostreaminserter.hxxNorbert Thiebaud7-7/+5
the intent of this header has canged over time. now it is already systematically included with ustring.hxx and the operator overload it provide fit nicely there... Just to be safe, since that include as been added to the api during the 3.5 timeframe and therefore is already in 'production' the header remain and simply attempt to include ustring.hxx but a warning is issued indicating that this header should not be used anymore... in a couple of major release we will thenr emove it completely All internal users of that header are converted. Change-Id: I8934c55f089e29d78c0f5649b7c87b2ecf024bad Reviewed-on: https://gerrit.libreoffice.org/634 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-09-17n#778140 testcaseMiklos Vajna2-0/+14
Change-Id: I50ba7e12eec41c90dff1a378113f46bff36552a4
2012-09-16Fix consecutive return, goto... statements are unnecessaryJulien Nabet1-1/+0
Change-Id: Ia0c399470b933824ae6fefbb486cf742f72312fd
2012-09-15Fix iterator managementJulien Nabet1-1/+1
Thank you Markus for your feedback Change-Id: I10fc6e2be8d648f3be1d2081582c90e27cf3505d
2012-09-14Improvement on previous commit, UCB clean upStephan Bergmann3-17/+17
* As UCB is only ever initialized with "Local"/"Office", remove this configuration vector completely. The "create" ctor creates an instance internally initialized with those "Local"/"Office" keys. Special (test) code can still instantiate an uninitialized one via plain createInstance. And for backwards compatilibity process startup still ensures to create an initialized instance early, in case there is still code out there (in extensions) that later calls plain createInstance and expects to get the already-initialized (single) instance. * XInitialization is an "implementation detail" of the UniversalContentBroker service, do not expose in XUniversalContentBroker. * ucbhelper/configurationkeys.hxx is no longer needed and is removed. * ucbhelper/contentbroker.hxx is an empty wrapper and is removed; however, that requires ucbhelper::Content constructors to take explicit XComponentContext arguments now. * The only remaining code in ucbhelper/source/client/contentbroker.cxx is Android-only InitUCBHelper. Is that relevant still? Change-Id: I3f7bddd0456bffbcd13590c66d9011915c760f28
2012-09-14fdo#45700: sw ODF export: workaround corrupted table model:Michael Stahl1-8/+3
do not export invalid table:number-columns-spanned="0" Change-Id: I7e286a9fcb6ed3df7222c83fe73e870e69561649
2012-09-13n#778836 testcaseMiklos Vajna2-0/+15
Change-Id: I0b6fbeff5d784e0e3f2067111cf505904f263844
2012-09-13SwWW8ImplReader::Read_Tab: typoMiklos Vajna1-1/+1
Change-Id: I0dd667ec59862acce283db5f91850306c94d207d
2012-09-12fdo#42450: also end undo on error conditionMichael Stahl1-0/+2
Change-Id: I59a33631d73a02cf8c84ccc002401bdc2da10267
2012-09-12SwDoc::InsertSwSection translate assertionMichael Stahl1-1/+3
Change-Id: I225610dd844b081eb0c0e4e5b1e0f31188cb8062