summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-05-10tdf#84317 convert missing numbering types to OOXML tokens.Mark Hung
CIRCLE_NUMBER -> decimalEnclosedCircle CHARS_ARABIC --> arabicAlpha CHARS_THAI --> thaiLetter CHARS_PERSIAN --> hindiVowels NUMBER_NONE --> none All the reset --> decimal All the types above were converted to 'none' before. Reviewed-on: https://gerrit.libreoffice.org/21741 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 91b926d4b9939337f54d6c9f0b940b161dc3437f) Change-Id: Ie97e3fd4a00b7e4cc80ffb3776028e431e0535de Reviewed-on: https://gerrit.libreoffice.org/24846 Reviewed-by: Mark Hung <marklh9@gmail.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-05-10rtf: m_aStates can be empty in the inner conditionCaolán McNamara
Change-Id: Id262a3019a693f236630b798579f360c9462d12e (cherry picked from commit 05cc87ce45fad402445c8d748817e386e56148af) Reviewed-on: https://gerrit.libreoffice.org/24830 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-10tdf#99207: Fix incorrect RGB ordering in Graphite DWrite pathTim Eves
Direct 2D accepts colours specified as UINT32 ARGB values or floats. However GDI presents colours as COLOREFS which are 32 bit FBGR (F is a flag not an alpha) values. Passing a COLORREF to D2D1:ColorF swaps the red and blue channels. This patch converts the COLORREF into RGB float triples using the GDI colour macros. Change-Id: Iee5c00bfb10fa8771a2a1019976f70633cca4094 Reviewed-on: https://gerrit.libreoffice.org/24819 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Martin Hosken <martin_hosken@sil.org> Reviewed-on: https://gerrit.libreoffice.org/24823
2016-05-10tdf#81833: form protection can be modified as compatibility optionOliver Specht
ProtectForm is supported to prevent editing outside of form controls but could only be imported from doc and stored in odt but not changed. Now it is part of Writer's compatibility settings dialog. Change-Id: I7337fb3f0774d3c1d26cd8e1485958399b2a70e2 Reviewed-on: https://gerrit.libreoffice.org/24294 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit 8d41866f76ce3909b8d1bba6d0b74c4acb91202b) Reviewed-on: https://gerrit.libreoffice.org/24300 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-10tdf#99479: Delete column with styles resets the 'Apply Style' drop downJulien Nabet
To start, the problem appears in SvxStyleToolBoxControl::FillStyleBox() pStyleSheetPool->First() returns null to pStyle because pStyleSheetPool is empty so we don't enter in while ( pStyle ) and can't add non default styles So why pStyleSheetPool is empty? pStyleSheetPool comes from pPool (SvxStyleToolBoxControl::Update()), pPool is retrieved from pDocShell->GetStyleSheetPool() (=> static_cast<SfxStyleSheetBasePool*>(aDocument.GetStyleSheetPool())) which is retrieved from xPoolHelper->GetStylePool(); ScDocument::GetStyleSheetPool() Let's move on, why xPoolHelper is empty? it's because when we delete the column, it does this: 0 ScPoolHelper::SourceDocumentGone (this=0x2c006c0) at /home/julien/lo/libreoffice/sc/source/core/data/poolhelp.cxx:116 1 0x00002aaad4e28eae in ScDocument::~ScDocument (this=0x8d6ac40, __in_chrg=<optimized out>) at /home/julien/lo/libreoffice/sc/source/core/data/documen2.cxx:426 2 0x00002aaad57a85f8 in ScDocFunc::DeleteCells (this=0x2c04bb0, rRange=..., pTabMark=0x3231ad0, eCmd=DEL_DELCOLS, bApi=false) at /home/julien/lo/libreoffice/sc/source/ui/docshell/docfunc.cxx:2415 3 0x00002aaad5cfa0f3 in ScViewFunc::DeleteCells (this=0x3230fd8, eCmd=DEL_DELCOLS) at /home/julien/lo/libreoffice/sc/source/ui/view/viewfunc.cxx:1512 But calling delete on pRefUndoDoc shouldn't call SourceDocumentGone since it's been created as a ScDocument with SCDOCMODE_UNDO eMode not with "SCDOCMODE_DOCUMENT" eMode. Since xPoolHelper is instantiated when only "SCDOCMODE_DOCUMENT" eMode (see http://opengrok.libreoffice.org/xref/core/sc/source/core/data/documen2.cxx#224), only destructor call of a document with eMode "SCDOCMODE_DOCUMENT" should be able to destroy xPoolHelper So the fix is only to call PoolHelper->SourceDocumentGone(); when (xPoolHelper.is() && !bIsClip) but also if !bIsUndo Change-Id: I1089d20264d0594c7e8ebe9263ebad6e68485c12 Reviewed-on: https://gerrit.libreoffice.org/24345 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Yousuf Philips <philipz85@hotmail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit a7b4a0a9f387310832cce7a6850ec438ce03b31e) Reviewed-on: https://gerrit.libreoffice.org/24792 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-10SubToolBarController: Use initialize to change tb bitsMaxim Monastirsky
update is called so late that the dropdown addition is noticeable by the user. Change-Id: I36d76770125f927a851caef010e81f12f40d4405 (cherry picked from commit e4ae5e2d4049765f65f8b5560216f3ffded19903) Reviewed-on: https://gerrit.libreoffice.org/24797 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-10tdf#82160 Reset mouse pointer if doc loading failedMaxim Monastirsky
Change-Id: Ib05226345c4b83d9190839de5cc04068ce1879d8 (cherry picked from commit a4eba3762a01c1b686cf7de19b9391d56606e08d) Reviewed-on: https://gerrit.libreoffice.org/24801 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-10tdf#93553 limit parallelism at zip save time to useful amountArmin Le Grand
At ODT export time writing and zipping comtained data packages is nicely parallelized, but not limited to an upper bounds of threads to use. Together with memory consumption this makes ressource usage and runtime behaviour bad to crashing (mostly on 32bit). I have now limited the processing dependent on the number of available cores to get a good processing/ressource ratio. The result uses much less memory, is faster and runs on 32bit systems. Reviewed-on: https://gerrit.libreoffice.org/23305 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> (cherry picked from commit 7e2ea27e5d56f5cf767a6718a0f5edc28e24af14) Missing include (cherry picked from commit 3cdc8c27672e7e9253c9ca9abfc611a0f789da9c) Change-Id: I8bd516a9a0cefd644f5d7001214bc717f29770ab Reviewed-on: https://gerrit.libreoffice.org/24807 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-10tdf#98224: endless loop in replace all stoppedOliver Specht
If a drawing in the document contains the search text then the selection of that object removes a selection (SwShellCursor) that marks the end of the search. This is now fixed for that special case. Replacing text in drawing doesn't work - as before and also not all occurrences of the searched text are found. Reviewed-on: https://gerrit.libreoffice.org/22851 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 83dccbadc2c6caa804039199915d4a8c1f3f2d5a) Change-Id: I4a10ddf2dc547572ebb55b6355439d6e320bc980 Reviewed-on: https://gerrit.libreoffice.org/24805 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-05-10tdf#99338 Fix GrabFocus during dispose crashesMaxim Monastirsky
Change-Id: I309e1e5f0d28c408c8a95190bf645abf680491b6 (cherry picked from commit 097bf754c09e8b1ba57e3367baa010898611b61b) Reviewed-on: https://gerrit.libreoffice.org/24794 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-09Hide text highlight color button for cellsMaxim Monastirsky
Highlight color isn't implemented for cells, so this button isn't going to work. (cherry picked from commit 36d68e49255d5fc2ded3c5a4aaa91b718122044d) Change-Id: If52d000ac80eb05c4f65cc42092ba91b9bb752c7 Reviewed-on: https://gerrit.libreoffice.org/24800 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2016-05-09tdf#94221 repair dialog for text along pathRegina Henschel
This corrects some errors in converting old kind dialog to glade. Separator items are count too, but were not considered. Therefore button and action were not sync. Two RADIOCHECK and CHECKABLE were wrong. Change-Id: Ie2c2f2febe7f7264fd08b8847dc72c3ee8d49a8c Reviewed-on: https://gerrit.libreoffice.org/24684 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit b8528dcb9c0c5ee75742df3c0e5ee9f373fbf154) Reviewed-on: https://gerrit.libreoffice.org/24795
2016-05-09tdf#99246 Use correct path for lock in PUT method.Giuseppe Castagno
Changed the tdf#, on master it's the wrong one unfortunately. Change-Id: I2091024a601bebede5d2fb8596dda1054ca4ef3b Reviewed-on: https://gerrit.libreoffice.org/24691 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit d324b4b3e1d32b25a6347f2f77ae921a584ee9b0) Reviewed-on: https://gerrit.libreoffice.org/24714 Tested-by: jan iversen <jani@documentfoundation.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-09fftester: fail on double parse of the same tableCaolán McNamara
Change-Id: I3e462cdc8812d0ac55d9896d2b04ace34a6c4670 (cherry picked from commit 4e509d80ee7b22ce0e79d62f7afb7a008726fe5f) Reviewed-on: https://gerrit.libreoffice.org/24773 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-06tdf#86575 for OOXML write plain #REF! if deleted partsEike Rathke
(cherry picked from commit bb0ef99fb9dce30e99a7e9f7fa295a634d07b423) write the [#REF!] as defined in ODFF, tdf#86575 related ... if a part of the reference was deleted, instead of [.#REF!A1] Actually this is a regression that already can be tracked down to c54616f62bc70a9d39abf8837a9d7c3031c80a41 which changed things to use ValidAddress() only. (cherry picked from commit eeb203089f2ba6dffba9a2543c9a7e8bf551bbc5) 70f68722d7af02f6da3380c2dd9d54704c20b451 Change-Id: Ie3233d72bdbdd0ab82386c98a46755ce64ef3e7f Reviewed-on: https://gerrit.libreoffice.org/24705 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-05-06tdf#93124: Fix incorrect text fit in imported PPT - take twoMike Kaganski
This patch just fixes incorrect decision when the block alignment must be applied. Also, unit test is included. Reviewed-on: https://gerrit.libreoffice.org/24648 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 940b21a87cffffca0985c33e9ebb78ddf3aa0c3b) Change-Id: I458184778c5e9e115d1a4eac749ecb6991b227a8 Reviewed-on: https://gerrit.libreoffice.org/24678 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-06opengl: combined commits for state trackingTomaž Vajngerl
Includes commits: opengl: track state of active and bound textures in context ba0a5708803d899de4c40cfe2c1697ae83b4827a opengl: track the state of scissor test and the dimensions 51e953a3579fb91f30f7f0d6159b737684976959 opengl: track the state of stencil test b8f0e6452cc019744c44997c92831d94086b35b7 opengl: sync scissor and stencil state, generic capability state a57d048f88ba6cac3ce1550e2a8a143a8887eb05 opengl: track the state of glViewport 540fee2dc7553152914f7f1d8a41921e765087ef Change-Id: I770a6a744c0c41850c576b928f027375962088aa Reviewed-on: https://gerrit.libreoffice.org/24508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-06gtk3: various bits means different things againCaolán McNamara
so active tabs don't look active without this on recent gtks (cherry picked from commit 235411c9d47ecba88e46d859ea93bcecefb0c46e) Change-Id: Iafa1e65fb0cc096513cdfe12a09fb0ef4c4d2db0 Reviewed-on: https://gerrit.libreoffice.org/24651 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-06Resolves: tdf#98940 (-1 not mapping to maximum string length anymore)Matteo Casalin
Change-Id: I58e4a63bce17b880a97c7ccfb4d42dfb930e54c5 Reviewed-on: https://gerrit.libreoffice.org/24268 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit eca3455190ed9a2c4796e7954f2533dc71cd1ab6) Reviewed-on: https://gerrit.libreoffice.org/24654 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-06fftester: double use of XFTable, ref this upCaolán McNamara
Change-Id: I8e0c2319b2f43b66686fbce372c5df63c75b343a (cherry picked from commit 19dde56de6f4d8613f156148f1e60256a8f5172a) Reviewed-on: https://gerrit.libreoffice.org/24683 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2016-05-05Resolves: tdf#94146 a11y crash, obtain formula using the correct pointerEike Rathke
Fallout from IAccessible2 integration. Of the union, wrong string pointer instead of formula cell pointer was used. Change-Id: I1afaf0ffff14a770ab52e8cbf880708bd66b3ef2 (cherry picked from commit 3a767d91bfa70af4303b905cefa038181d56cc9a) Reviewed-on: https://gerrit.libreoffice.org/24652 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-05tdf#98512 Fix the Undo action of insert an input field.HaidongWu
Reviewed-on: https://gerrit.libreoffice.org/23055 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit ed81bf39dd3431d28860fed6a2d4e8814126cc61) tdf#98512 sw: remove duplicate undo history add Follow-up to commit ed81bf39dd3431d28860fed6a2d4e8814126cc61. In almost all cases SetAttr() and InsertHint() will already add the history hint themselves, so this code in SwRegHistory::InsertItems() looks somewhat pointless as it inserts a duplicate. It turns out it's needed for hints that insert dummy characters, because firstly for the hints-without-end the NoteInHistory() was not called, and secondly when InsertText() inserts the dummy character it may actually delete the hints array if there are no pre-existing hints, and a new hints array will be created where the SwRegHistory isn't registered. It's not obvious how the hints array actually can become empty in SwTextNode::InsertText(). Let's fix that and assert instead that the history hint was inserted. (cherry picked from commit b44e70e3d17c79eaf78f9bfe8bd0275d7ed9325f) tdf#98512 sw: add unit test ... and fix the SAL_WARN not to warn spuriously. (cherry picked from commit 20ae3d14187dacce2c2a1d2eab389e6110fe8442) Change-Id: Ic951fc0d811e5cab39989285d34bdd2fff8f95fd Reviewed-on: https://gerrit.libreoffice.org/24664 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-05sw: HTML filter: avoid turning on Undo with ridiculous hacksMichael Stahl
SwHTMLParser::SetControlSize() loads a "hidden document" into the same model (!) that is currently being imported (!), just so it can get a awt::XControl from the ViewShell; unfortunately creating the ViewShell happens to enable Undo too, so turn that off again. This avoids triggering the assert in SwRegHistory::InsertItems() on kde122884-1.html Change-Id: I3d8fcd5c43bcb8e7ed8775710acbc2d40f2ffdd0 (cherry picked from commit 2ce95e838260ed1e7e64ac8f5662aa2e2234ab9e) Reviewed-on: https://gerrit.libreoffice.org/24665 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-05tdf#95707 RTF import: handle device-independent bitmapsMiklos Vajna
See <https://msdn.microsoft.com/en-us/library/dd183374%28v=vs.85%29.aspx> for more info about the header structure that has to be prepended to the real data to make our BMP import filter happy. Also: disable a unit test on OS X, that previously passed, but turns out to be unstable on libreoffice-5-1. (cherry picked from commit 6bacfc8d95163a3eacc2784660282a8ce7d9a552) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: Iabdf4cd169b82ea951d1c1b12432d97d61b7af51 Reviewed-on: https://gerrit.libreoffice.org/24656 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-04sw: try to survive restoring a field dialog without SfxObjectShellMichael Stahl
The SFX will apparently restore the field dialog on startup if it was open on the last shutdown. Since i don't know how to disable this useless "feature", let's fudge things a bit so we don't crash immediately. Change-Id: I2c401440374d055774fdc8fcbd79a1262c42da0b (cherry picked from commit bf47fef3a87d8546f18a36ade4e85f7c6ecf993b) Reviewed-on: https://gerrit.libreoffice.org/24614 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-04sw: SwFieldVarPage: disable "Insert" button on "Input field"...Michael Stahl
... if no variable name is selected. It doesn't work in this case. Change-Id: I36745806bcfc688b54b1ec49d0376b05bb5bbea6 (cherry picked from commit 6d81c777232f3abeb3b05f89ad37f266d65eabbb) Reviewed-on: https://gerrit.libreoffice.org/24615 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-04tdf#99529 sw: don't pop up input field dialog before inserting fieldMichael Stahl
The dialog calls SwEditShell::UpdateFields(), so if there is already a existing field at the current cursor position it will be "updated" before the new field is inserted. Change-Id: I8ddbbe00534950759781a1ce8d0dca0376663462 (cherry picked from commit 39d719a80d8c87856c84e3ecd569d45fa6f8a30e) Reviewed-on: https://gerrit.libreoffice.org/24613 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-04tdf#90097 RTF import: handle fRelFlipV property for line shapesMiklos Vajna
Can be extended later in every direction: fFlipV, fRelFlipH, non-line shapes. See oox::drawingml::Shape::createAndInsert() on why the convertMm100ToTwip() conversion is necessary. Change-Id: Ifee401dd8dd392c2c9ff85cc871ca0169fcf930b Reviewed-on: https://gerrit.libreoffice.org/24385 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 6046062719f30849cd97161c6a89d27a0b0d2a20) Reviewed-on: https://gerrit.libreoffice.org/24612 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-05-04update creditsChristian Lohmaier
Change-Id: Icb4a443dba8eb22e49fe622ed5ef7c84fabc901b (cherry picked from commit fe81d707b5b4e832b249ae879a75f336cd06a81f)
2016-05-03bump openssl to 1.0.2hChristian Lohmaier
Reviewed-on: https://gerrit.libreoffice.org/24617 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 7ecaf61287606001eac9b3d76df95a0a900e11c0) Change-Id: I1e7c090ff58dc296641a1ce00a2ca4189e9e4156 Reviewed-on: https://gerrit.libreoffice.org/24622 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-05-03Updated coreChristian Lohmaier
Project: translations e2faec46ab3cada7198c6d912287d75742e5d27f update translations for 5.1.3 rc2 and force-fix errors using pocheck Change-Id: I1d7f22dd67fb84e61f1122c4897a668e1e7aef9b
2016-05-03tdf#99353 take the footgun away from FilterCacheDavid Tardon
FilterCache::impl_saveItem changes the properties of a config. item one-by-one. But it also listens to the configuration changes and reloads the whole item from the configuration on change... Change-Id: I9e4ed1c6b013925d07f0942717fe3421f924279d (cherry picked from commit 390ddd3bde617388e481b6747aa7bbea17d5ddf1) Reviewed-on: https://gerrit.libreoffice.org/24610 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-03tdf#93640 Fix import of linked left page header/footerLuke Deller
In a docx section, any header/footer which is not defined in the section is considered to be linked to the previous section. In the Word UI this is shown as an option named "Link to Previous", and editing the header/footer in either section affects both sections. LO imports this by copying the header/footer contents from the previous section, but it did not handle the case where a section had different headers for left pages vs right pages. Fix this, which involved changing the mechanism used to detect whether a section has defined a certain header/footer (which unlinks it from the previous section): rather than trying to figure it out from the converted LO page styles, explicitly track which headers/footers have been defined using boolean member variables on the SectionPropertyMap instance. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Ic43a867356c2cd5df09d39f2a3ddefa584b6765c Reviewed-on: https://gerrit.libreoffice.org/24608 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-03tdf#99474 close direct char fmt at end of paraLuke Deller
When exporting to doc, ensure that the FKP entry for direct character formatting is closed at the end of a paragraph, so that any direct character formatting in the next paragraph does not apply to the end-of-paragraph marker (CR). Also revert the changes for i#119650 and tdf#87437 which targetted more specific examples of this problem, as those issues should now be covered by this fix. Add a test case for the example from tdf#99474 Change-Id: I2cb482adb39a84f152707dafcb18f289ca0bd550 Reviewed-on: https://gerrit.libreoffice.org/24609 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-03Resolves: tdf#99425 crash when closing dialog editorCaolán McNamara
with undocked "Object Catalog" toolbar Change-Id: I70d51cec699333c5cfc1461d61734c1bbb5323da (cherry picked from commit 4f92eb777ab17e0a2ee478572a46d060742902e1) Reviewed-on: https://gerrit.libreoffice.org/24281 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2016-05-03Resolves: tdf#96426 significant whitespace as intersection in Excel syntaxEike Rathke
Also when reading/writing OOXML, so change SC_OPCODE_INTERSECT of RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML accordingly to " ", where previously "!" was expected and written, which was plain wrong. (cherry picked from commit 26adceb098134d918f6d57c8687ab057e24adc39) simplify the ReplaceToken() offset logic to absolute offsets (cherry picked from commit f41257dc9913cd6020a3a37bf425c20b51e18ece) fully check for adjacent RPN end, tdf#96426 follow-up (cherry picked from commit b0992e11905e36a64edeb92a13acfde5837c1878) narrow down where a space could be an intersection, tdf#96426 follow-up (cherry picked from commit e0875f8e348a3aca036bc0cc629fb038fabc8062) Adapted to backport. more differentiated significant whitespace recognition, tdf#96426 follow-up (cherry picked from commit 0f8a8332a52cd03b43aaab86e0c232e0964d7111) first range can be anywhere before second at RPN end, tdf#96426 follow-up ... not just adjacent to the one at the end. So we actually can handle INDIRECT("A2:C2") INDIRECT("B1:B3") (cherry picked from commit 0c5663cfb13f4f55e246d42ac464d5e2c2f23099) check presence of token, tdf#96426 follow-up (cherry picked from commit edd4370f5ba49a26a526995b6a28f623d68041ce) 4c368dfd113b02d208013b4ba79dff606769a150 8d02fb63bc0c5cb48aabaf7a8800f5f9ac95cbf5 886e559c6f6041bf4889fdd6d89c12a10be70e5f c53a4a0d19a11298895efb28e2786e48a071e72b 081409a82a9ff64f163115bf4597afbb9b2f5fa6 e8030ebc13bb1ae2246611f5722da97970b8c544 Change-Id: Ic0cfd7afc657f07bfd8e37de61b3621cc68685ff Reviewed-on: https://gerrit.libreoffice.org/24374 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-03Resolves: tdf#99417 explicitly track formula cells for BROADCAST_BROADCASTERSEike Rathke
Change-Id: I717fc6d1d7c2bc01ed2a256f6fc08a055be24e4b (cherry picked from commit a0b9fa819c9193dee1405cee13690adf00e2d9b9) Reviewed-on: https://gerrit.libreoffice.org/24592 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-03tdf#90319: make image flipping work when aLinearContext(...) code path chosenpasqualm
Image flipping can be processed following different code paths in bitmap.cxx. Has been verified that it was broken in Linux Mint (with cinnamon) because there a buggy code path was chosen which was not fixed in commit 3119440a80282692640378fde5e37974ab63f096 in master. This commit solves the problem for this code path Change-Id: I22257e70761ca5469c0424b5f9925681cfd4e2e3 Reviewed-on: https://gerrit.libreoffice.org/22753 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jacobo Aragunde Pérez <jaragunde@igalia.com> (cherry picked from commit 1e3d634e413abf2b4c2a6c70a87586d8c598054c) Reviewed-on: https://gerrit.libreoffice.org/23852 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-03tdf#99314 lokdocview: add new userprofileurl propertyMiklos Vajna
So that users of the widget can use a custom user profile, allowing running widgets users and LibreOffice in parallel. (cherry picked from commit df784ec1bf3d1745a291056df28bec799d4fdee3) Conflicts: libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx Change-Id: I1bd0a8e53aa3216adc721052cf30f0dd174327bd Reviewed-on: https://gerrit.libreoffice.org/24591 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-03Resolves: tdf#99461 reverse logic of TokenPointers::skipToken()Eike Rathke
... so that all code tokens are adjusted even if shared with another flat copied token array, but RPN not if shared. Was vice versa. ScConditionEntry has shared token arrays for pFormula1|pFCell1 respectively pFormula2|pFCell2 hence the references weren't updated. Change-Id: I52256b5ea20da753a2a29ff437f09c921566e070 (cherry picked from commit 03124f5be5466c7f7cac012de05ef387b9718c4a) Reviewed-on: https://gerrit.libreoffice.org/24375 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-03rhbz#1326602 avoid exp. bg bitmaps from deleted slidesDavid Tardon
ODF export uses SvxUnoBitmapTable (impl. of com.sun.star.drawing.BitmapTable) to create fill bitmap styles. That returns all XATTR_FILLBITMAP items that are in the document's pool. So we ensure that bitmaps that are only used on deleted (either explicitly or by undoing their insertion) slides are not in the pool. (cherry picked from commit b876bbe2cacce8af379b10d82da6c7e7d229b361) Change-Id: I54c594a94989158f22b156fe660c1e716b988b3e Reviewed-on: https://gerrit.libreoffice.org/24590 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-03Related tdf#98416 Libcmis: add a patch to fix Google Drive loginGiuseppe Castagno
The new Google login sequence uses two html pages: one for user email the other for password. The older sequence used only one page for both user email and user password. Reviewed-on: https://gerrit.libreoffice.org/24513 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 3db082a75210bbf0fc657831443c589a4226b997) Signed-off-by: David Tardon <dtardon@redhat.com> Change-Id: If875ba3ec9680d7e8c700a269873e427ac037a8e Reviewed-on: https://gerrit.libreoffice.org/24588 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-03Fix failure to print when using the D2DWrite pathTim Eves
It seems that D2D1DCRenderrTarget cannot bind to a DC on a printer device. Now whenever that attempt to bind the DC fails we run the legacy API path as a fallback. Change-Id: I6ad8d82e5280fd2dcf669310bab0f5bfc23a138a Reviewed-on: https://gerrit.libreoffice.org/23366 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Martin Hosken <martin_hosken@sil.org> Reviewed-on: https://gerrit.libreoffice.org/24603
2016-05-02Iteration must not start at the endSeraphime Kirkovski
Change-Id: I2aebcc909aa9222fc1881e57bbc844025a154e84 Reviewed-on: https://gerrit.libreoffice.org/24497 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de> (cherry picked from commit 7739bd5f54606603b9b8199f2cb12c4a1cb86b4f) Reviewed-on: https://gerrit.libreoffice.org/24587 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2016-05-02tdf#99135 VML import: handle image cropMiklos Vajna
The spec says in theory a % suffix could be also supported, but let's wait till that is seen in a real-world document. Change-Id: Ie026915e38dcb03c99085a1740075364b00e1c8d (cherry picked from commit bb646c1472d3b77066b01128baf1c9cafdb40233) Reviewed-on: https://gerrit.libreoffice.org/24364 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-05-02tdf#99452 svx: fix undo of table row edge dragMiklos Vajna
The problem as seen by the user: if you have a table of 2 rows and 1 column, and the separator line is dragged upwards by the mouse, then undo doesn't restore the original situation. Two items are created on the undo stack: sd::UndoGeoObject and sdr::table::TableRowUndo. Let's say the table height is 8000 mm100 and the two cell heights are 4000 and 4000. If the user resizes the first cell, so that its height is 2000, then the new table height will be 6000. The problem is that when undo is executed, first sd::UndoGeoObject resizes the table, distributing the newly available 2000 between the existing rows, and then sdr::table::TableRowUndo sets the row height of the first row: the height of the second cell will be larger than expected. Fix the problem by not doing a relayout during sd::UndoGeoObject, but doing a relayout after sdr::table::TableRowUndo in this case. This is done by: 1) Adding a new SdrDragStat::mbEndDragChangesLayout, so that SdrTableObj::applySpecialDrag() can inform SdrDragObjOwn::EndSdrDrag() that TableRowUndo will do the layout instead of UndoGeoObject. (This is done only in case a row edge is dragged, as otherwise it's not guaranteed that a TableRowUndo will follow the UndoGeoObject on the undo stack.) 2) Adding a new SdrUndoGeoObj::mbSkipChangeLayout, so that SdrTableObj::applySpecialDrag() can let SdrUndoGeoObj::Undo() not do the layout. 3) Adding a sdr::table::SdrTableObjImpl::mbSkipChangeLayout, so that SdrUndoGeoObj::Undo() can let SdrTableObj::NbcSetLogicRect() not do the layout. 4) Marking the table model as modified in TableRowUndo::setData(), so it does the layout at the end of the undo group. (cherry picked from commits cafc53f8b4c08443524b1da6f4918d49afd45bb5, 8d1fa417bc49a9e9eee923e3ce6a37d7b0f056f1 and 758e6f39d96237881198818e3bac432012be61d8) Conflicts: sd/qa/unit/tiledrendering/tiledrendering.cxx svx/source/table/svdotable.cxx Change-Id: I8adde3cdad5741e6fcb420e333ce336e18c77cf1 Reviewed-on: https://gerrit.libreoffice.org/24392 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-04-29Specify Alfresco 5 in the list, it also compatibleGuillaume Smaha
Change-Id: I29d32253259c296e2e5fedcff241573479b2d4a3 Reviewed-on: https://gerrit.libreoffice.org/24426 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 2c47053e7edd062e6a7abd3ff889b756018ff7c3) Reviewed-on: https://gerrit.libreoffice.org/24462 Tested-by: Jenkins <ci@libreoffice.org>
2016-04-28Resolves: tdf#99498 don't overwrite trwWidth value if set on a tableCaolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/24430 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b71f470e370c1819cba99abe5ef654d28bbf8749) Change-Id: Ia39da999a2de1ca2b8bec5fc7f35d2f9ffe2dd19 Reviewed-on: https://gerrit.libreoffice.org/24434 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-04-28tdf#99460 sw: layout: don't split table before flyMichael Stahl
First the table is formatted properly and then the following paragraph is formatted, along with its anchored objects. The Fly frame is aligned to the bottom of the page by SwAnchoredObjectPosition::_AdjustVerRelPos() without checking for any overlap, and thus overlaps the table. Then SwFlyNotify and Notify_Background() invalidate the table's PrtArea, and the table responds by splitting numerous times, until finally there is a page where the table does not overlap with the fly any more. Instead of the table splitting, the paragraph with the Fly anchored to it should move to the next page; suppressing the table invalidation in Notify_Background() appears to achieve that. Change-Id: If65879f1756856bda344e0ef8fbffbc33e80f3ec Reviewed-on: https://gerrit.libreoffice.org/24307 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e1fc96df40cb758399ca3b6e74660f381ef16916) Reviewed-on: https://gerrit.libreoffice.org/24441 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-04-28tdf#89866 tdf#96504 vcl: fix printing of form controls with imagesMichael Stahl
Originally in 2004 commit 0339e43208cd7b98d302e420b39ac32911acaa56 added a "DBG_ASSERT( GetOutDevType() != OUTDEV_PRINTER, "DrawImage(): Images can't be drawn on any mprinter" );" Recently commit f749ffbdf4c007f1a42bcafc9c2723c47bac22d1 made the mistake of trusting this assertion to be correct and added Printer::DrawImage() overrides that do a hard "assert()" now and don't do any drawing. Armin claims that the implementation of OutputDevice::DrawImage() should actually work for Printer as well due to fall-backs and thus the original DBG_ASSERT was misleading. This matters when printing documents that contain form controls such as ImageControl. Additionally, Image::Draw() should not return early when IsDeviceOutputNecessary() is false, because that is the case when printing, where instead a meta-file is recorded. The called OutputDevice::DrawBitmapEx() will check IsDeviceOutputNecessary() internally anyway. This check was actually always there, so i do not understand how this should have worked in LO 4.2, as the bug reporters claim. (cherry picked from commit ef52ce82bf55b37279e344ea5fef67b4277fb009) Change-Id: I92ba19e7036197d1dde88c361f8e1cb59fae3a60 Reviewed-on: https://gerrit.libreoffice.org/24439 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
generated by cgit (git 2.34.1) at 2025-03-12 21:22:24 +0000