AgeCommit message (Collapse)AuthorFilesLines
2015-10-19Bump version to 4.4-10cp-4.4-10Andras Timar1-1/+1
Change-Id: I06a273b32be167a3bad311131a756e5b62485779
2015-10-17update creditsChristian Lohmaier1-1272/+1315
Change-Id: Iac825646e33cb40f7d8a1c1aa6a3e67f3aac5980 (cherry picked from commit aa2886cf7d86175fead49a038b16a77a982a777f) (cherry picked from commit 2eb0e9cddabcbf0c56af3739466843def1d2417a)
2015-10-17tdf#77014 fix input field breaking of words at new lineTomaž Vajngerl1-50/+1
SwTextInputFieldPortion::Format has previously tried to erase the input field special chars, which caused the words not breaking as expected or in the same way as normal text. It appears that it is actually not necessary to do this at all so just calling the super class method SwTextPortion::Format does the job and fixes the problem. After testing I could not find anything that is obviously wrong. (cherry picked from commit 5e1714fd7fcb45fa5f1220d892dba597da40b500) Change-Id: Ie763f55ad55863dd224425dc481b7100deb639fa Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <> (cherry picked from commit 2436123e60a892ae74f65b2698d23c3b36a89f12)
2015-10-17tdf#94804 sw: allow duplicate heading cross reference bookmarksMichael Stahl6-5/+164
... in ODF import, so that reference fields do not break that reference numbering cross reference bookmarks that were corrupted by commit 679faffc68bb854af0f55d0f218698e2f372f00b. This used to work by accident before commit 9d0c51daea67104349cac26de9839afa8baeb099 fixed it to actually check for duplicates properly. (cherry picked from commit 7c3c3006deaaaf1bb3f2f4eeeaf11da3bcebe53c) Change-Id: I5ed58eda7f3f2ce470a778852f6dda7a14356860 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit e95b9fd796e3a52afbb52bc142019115653c6099)
2015-10-17tdf#94804: prefix to save cross reference bookmark fixedOliver Specht1-1/+1
bookmarks as references to numbered paragraphs are now saved using the prefix '__RefNumPara__' as the import already expects Change-Id: I6f7c41e95fa9f936a7eb21d4cb7461d4575c492a Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Michael Stahl <> (cherry picked from commit 85eb4d9514858c71fb22c5ed93d651ea24bc6c05) Reviewed-on: Tested-by: Michael Stahl <> (cherry picked from commit bdc5aab39be149b2fc7d37520414ae251341bc14)
2015-10-17xmloff: fix ODF import of gradient draw:angle attribute a bitMichael Stahl8-9/+345
ODF 1.2 part 3, 18.3.1 angle, says "An angle, as defined in §4.1 of [SVG]" and "If no unit identifier is specified, the value is assumed to be in degrees." Unfortunately OOo could only read and write 10th of degree here. See also As the first step towards fixing that, implement the import for draw:angle values with an angle unit identifier, but leave the import as-is if the angle identifier is missing. (cherry picked from commit aadda5d17f6e422da143ea774f759bfc5f629c5b) Change-Id: Ib88d417c03998ebcfc569b01492f0e1f851bbc85 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <> (cherry picked from commit 49d2b78f61ffd7c462e5c41a8cd01933edc877ed)
2015-10-17tdf#94679 Writer: fix lost selection with Shift-PageDownJustin Luth1-3/+7
Push/Pop-ing the cursor led to selection loss. SelectHiddenRange() immediately returns false if the current cursor hasMark(), so avoid all of the bugs and expensive push/pop routines when there is a mark already. Change-Id: I4624a3e0b2267942812d0429d527ad97962ec7fc Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit fb62052d5ac069d700a5410db35d6949a4c4008b) Reviewed-on: (cherry picked from commit 22560075218c6166d44367957f4a733ea50ff9c3)
2015-10-17Resolves: tdf#93613 let referenced document evaluate macro configEike Rathke1-0/+16
... if the current document allows macros. Change-Id: I927981334e27d073696286ba680777a645d53653 (cherry picked from commit 8e2acdbcbd3afc1777d6e68a83ebbe6d8dd77645) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit 6fb4312af9968631eac0c05129a0e255fc411ad4)
2015-10-17Related tdf#94557: Combo box entries are case-sensitive (sometimes)Lionel Elie Mamane1-2/+2
Revert partly author Julien Nabet <> 2015-03-16 21:31:23 (GMT) committer Caolán McNamara <> 2015-03-26 14:14:44 (GMT) commit 76f33f10309b0ee384a75a7a854858b068d60495 (patch) tree e12e3b6f2ca46cb9998b93b5c1bb3406408ad3cb tdf#67990: Management of case in combobox See comments of tdf#94557 for more information More conservative version of this commit for libreoffice-4-4 branch. Change-Id: Ie634032b51688939216c8671c5e20f00bd67a33c (cherry picked from commit 75c3395de205fda16054e70d1dd296ffdc603426)
2015-10-17update creditsChristian Lohmaier1-1236/+1275
Change-Id: I68bbfa570743c1c8bbc376d377e0f08cff7aead4 (cherry picked from commit 6a3d10a14e024359896a2f1f5b58ac9fbff4b579) (cherry picked from commit 2c4b41a3e5b8940961e443a846a5fa43fd4c0973)
2015-10-17bump size typeCaolán McNamara2-3/+4
Change-Id: I2c32c253499a3efb22a3312ed1f0a608649ce124 (cherry picked from commit dc71a72753202d29544845cfd58992bac63c6837) Reviewed-on: Reviewed-by: Michael Meeks <> Tested-by: Michael Meeks <> (cherry picked from commit 8840f5c2d7739e751e29b88224b416b20e3cd26a)
2015-10-17deb system integration postinst and postrm scripts are not needed hereAndras Timar2-57/+0
... because special 'debian-menus' package from sysui module does the job We do not have these scripts in rpm packages, let's not have them in deb packages, too. Change-Id: Iae7e996c3c3a8c1fb40977436773829a16e93fee (cherry picked from commit f8f1a0645106a02a926e96d61f5a55c0e8e41a7b)
2015-10-17PREFIXDIR must be /usr for .deb system integration packageAndras Timar1-0/+1
... tools don't find *.desktop files in /usr/local or elsewhere, and the applications will not be registered in menus. Fixed the regression from d2cc121e0798a007a6e0409b09c16ce747ab959f Change-Id: I679b98b5cd0a502553fb13025ee8b9ac4bb5507e (cherry picked from commit eb911d69221a5491e75ab0ea47985535a0102aad)
2015-10-07Info.plist: fix ERROR ITMS-90243cp-4.4-9Andras Timar1-0/+4
"The product archive is invalid. The value of the CFBundleDocumentTypes key in the Info.plist must be an array of dictionaries, with each dictionary containing at least the CFBundleTypeName key." Change-Id: I70570cdbe729e64453a88b6a7abbfd4259333237
2015-10-07Bump version to 4.4-9Andras Timar1-1/+1
Change-Id: I05e0e9ed8e9d8b68375d1da189710b3fc0d43fe4
2015-10-07tdf#92454 DOCX import: allow overriding para prop from num style in para styleMiklos Vajna3-0/+17
Word has a feature like this: a paragraph style can refer to a numbering style, and both can specify paragraph margins. If that's the case, then the ones from the paragraph style has priority. In Writer, the numbering style has priority, so the only chance for correct import result is to set the margin directly on the paragraph in this case. (cherry picked from commit f4badd9a485f32f787d78431ed673e2932973887) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Iff3b03bcc56e0db3a48452c293acf41c91b8f159 Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2015-10-07Probably good to move the more complicates test after the light-weight onesTor Lillqvist1-3/+3
We will return false if any of the tests here match, so good to test the trivial things first before ones involving a potentially complex function call. Change-Id: I531282041c888799d37d95ae773daa349e60a37d
2015-10-07tdf#94173: Calc doesn't save your own created autoformat presetsJulien Nabet2-1/+15
Auformat list (maData) is defined as "MapType" which itself is defined like this: boost::ptr_map<OUString, ScAutoFormatData> so default sorting is ascii 2 consequences: 1) Default didn't appear first 2) When adding a new autoformat entry when it was new first one of the list wasn't saved because of iterator was incremented first before looping See There were some other weird behaviors too according to comments of the bugtracker Regression from Solution: Add a Compare so Default entry is always first one so the first time incremented iterator is ok and new entry (even if new first one in list) is saved Thank you Markus for the idea! (I was lost in Compare syntax) Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Julien Nabet <> (cherry picked from commit 652158c3f2c9cd0d6f71ecd14bf5d5cc02a71b50) use collator for UI visible sorting, tdf#94173 follow-up (cherry picked from commit a71febc99d2cfc2fe51dec8c0bca5d84d8577168) b9f7ebb087c1ce5008f43b2df3f1fadc41066ed1 Change-Id: I9ba0cdc63c66b747db102bb661cd09fbfe5996ae Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <> Reviewed-on:
2015-10-06tdf#94595 fix Info.plistAndras Timar1-1931/+1774
Change-Id: I3286c4ed2c2676e6bdc4e109baea9d558331df4d
2015-10-02more tweaks of "provides" sectionAndras Timar2-7/+9
Change-Id: I1ea6a63d152d4b7813586f7511a84ef83286dd44
2015-10-02update creditsChristian Lohmaier1-1128/+1146
Change-Id: I4c21115a9274dbf5fc138705527f2229554ba6f8 (cherry picked from commit 7d596a4b51b6a6efa3ef239a600a931b6adc457c)
2015-10-02tdf#92521 DOCX export: handle section break right after a tableMiklos Vajna9-34/+62
DocxAttributeOutput::SectionBreaks() previously only handled the text-text and text-table node transitions; implement support for table-text to avoid loosing a page break on export for the bugdoc. (View this commit with whitespace ignored to filter out the noise about SectionBreaks() now accepting non-text nodes, too.) (cherry picked from commit c916152d8562cab868d4c522748ac30029fad179) Conflicts: sw/source/filter/ww8/attributeoutputbase.hxx sw/source/filter/ww8/docxattributeoutput.cxx sw/source/filter/ww8/docxattributeoutput.hxx sw/source/filter/ww8/rtfattributeoutput.cxx sw/source/filter/ww8/rtfattributeoutput.hxx sw/source/filter/ww8/ww8attributeoutput.hxx Change-Id: Ie8a1575374a207399351635bda8c0c076ce7268d Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-10-02bnc#939996 tdf#93919 DOCX import: fix left-from-style and first-from-directMiklos Vajna3-0/+11
With this, <w:ind w:hanging="..."/> as direct paragraph formatting and <w:ind w:left="..." w:hanging="..."/> as a numbering level formatting is properly merged, i.e. w:left is not lost, defaulting to 0. (cherry picked from commit 56341e5d496f576dc45fe8e6c44831d780fecb73) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: If5534fbd9ee6d41139b0ed3a3df9d0cc5aad3239 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-10-02use exponential 'E' format for General when appropriateEike Rathke1-17/+35
Fixes all these test case scenarios: 1. in A1 enter =1E222 * move cell cursor back onto A1 * status bar displays Sum=100000... repeated until filled (or 222 '0' characters) 2. invoke number format dialog on A1 * for General format 100000... is displayed in the preview 3. move cell cursor to A2 * open Function Wizard (Ctrl+F2) * choose (double click) ABS function * enter A1 as parameter * see 100000... displayed as Function result and Result 4. save as .ods * in content.xml see display text of A1 being saved as 100000... (cherry picked from commit ef0a26835e68deb31906c40cfe48c66674d9d0d1) Conflicts: svl/source/numbers/zformat.cxx Change-Id: I7c22c0461a6783c85c1d51c31e8607fb2edb821c Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-10-02don't over-expand built-in file dialog on very long paths/namesCaolán McNamara1-0/+2
Change-Id: Ia8167833b54bcfc68f1a306e58a1134a38d64ef6 Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Cor Nouws <> Reviewed-by: Adolfo Jayme Barrientos <> (cherry picked from commit ce75966ae16381353fe75f9df2f56d03b8861cd5) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-10-02don't believe xls wrt size to reserveCaolán McNamara2-3/+8
(cherry picked from commit 358ca9eaa3d85236047a7a2781e38f57209c2858) Change-Id: Id9864f199e270d13d801348b12f1e94dd80558c7 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2015-10-02accept OS X 10.11 in configure, and fix firebird build against itTor Lillqvist2-4/+22
Accept also OS X 10.11 Change-Id: Ieedf4810f1e726bf11f0d0b1a203e560a0b16550 (cherry picked from commit bcd52844597640504d3a7caf5441f9f6181497c5) Fix Firebird build against OS X SDK 10.11 Change-Id: I60c7540241c41f5063736f2a3d4817371411c8dc (cherry picked from commit a799d7c9a66464f33bd8ee42d535e29a976d64ae) Reviewed-on: Reviewed-by: Tor Lillqvist <> Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2015-10-02tdf#91293: Preserve hyperlink on URL field OOXML exportKatarina Behrens2-19/+23
The fix is twofold: 1.Get URL property from the underlying text field, not from the text run -- put text field properties into rXPropSet (that's what GETA macro later queries), not into rRun 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 does s/rXPropSet/rRun/ afaics for no good reason 2. Retrieve string content from URL field early, so that the test for empty text content doesn't fire Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <> Conflicts: oox/source/export/drawingml.cxx sd/qa/unit/export-tests.cxx Change-Id: I4317e4a2f6f2e6f15c30932adc80f1227e010af0 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2015-10-02wmf spec says that these are only allowed bitcount valuesCaolán McNamara2-1/+13
Change-Id: Ia174feec73ee676567a3632d2f88b11c176b6363 (cherry picked from commit b107353addfe35cc40864b7fb5ff4fee42fff6cf) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2015-10-02Better fail with E_EXIST if rename(3) failsStephan Bergmann1-1/+1 leads to better handling of the failure downstream, if e.g. this is an attempt to copy a file from the presets to an existing file of a previously partly generated UserInstallation, and the presets and the UserInstallation are on different drives and rename(3) fails with EXDEV. (Without this fix, removing the UserInstallation's registrymodifications.xcu caused restarting soffice to fail with "User installation could not be completed" in this case; regression introduced with 6edbcc1b231feb02f304ff646c323b5df051d9a4 "cid#1242936 handle rename failure.") Change-Id: I409698c4e2e6cc6ccd8b2be80a393c9657b5125d (cherry picked from commit d2a7abebf210cacf9ea357dd8b4a0772be7308df) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2015-10-02Fix tdf#87500 - Freeze with English/Japanese mixture undo.Mark Hung1-18/+25
Language poolitem will be inserted after user completes editing with IME, making it refer to valid range when undo. Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> Conflicts: sw/source/core/doc/extinput.cxx Change-Id: Id2876aa74dba6f7d134b8e2df4d9b36a8f429bb1 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2015-10-02Resolves: tdf#85979 TextToColumns is overwriting, so set at ScImportExportEike Rathke1-0/+1
Change-Id: Id0fec512b53aab47f9951056e8726af0cce45708 (cherry picked from commit 624ab2e5a52e9b8aa139bae4cd1436d23b80bf8c) Reviewed-on: Reviewed-by: Christian Lohmaier <> Tested-by: Christian Lohmaier <>
2015-10-02follow up of tdf#94214Winfried Donkers1-0/+1
provide forward compatibility for name change of FINV Change-Id: I0afd2555be94c452172e5a357f2f0897be381863 Reviewed-on: Reviewed-by: Christian Lohmaier <> Tested-by: Christian Lohmaier <>
2015-10-02update creditsChristian Lohmaier1-915/+925
Change-Id: I6287394ba04c7ec81ffb39229a0147e829615b07 (cherry picked from commit dfb00ac6ee43e008cc46c71546ba4af64d3a0bbd)
2015-10-02fix IterateMatrix for ifPRODUCT and ifSUMSQEike Rathke1-1/+2
... if more than one argument is passed to PRODUCT() or SUMSQ() and matrix/array arguments are involved the functions returned wrong results. For example, wrong behavior =PRODUCT({2,3},{4,5}) gave 6 =SUMSQ({2,3},{4,5}) gave 34 Correct is =PRODUCT({2,3},{4,5}) result 120 =SUMSQ({2,3},{4,5}) result 54 Change-Id: Iec7b136a5cc678416f28b1abfe19cd0901ef22b6 (cherry picked from commit c1780ad265ce5f6abb3b91a4f70bf2b3d7a47149) Reviewed-on: Reviewed-by: Łukasz Hryniuk <> Tested-by: Łukasz Hryniuk <>
2015-10-02Revert "Fix a bug in SUMSQ"Eike Rathke1-1/+0
This reverts commit 2c6b94672e8536ade098244c9c32e67dd23e119a. Just discovered that this is wrong, sorry for fuzz. Change-Id: I66f0d69ee6f558d2dc968ecdfff6f9dd42332a7e Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2015-10-02Fix a bug in SUMSQŁukasz Hryniuk1-0/+1
The same one as was in SumMXMY2, with IterateResult. Change-Id: I18a5993493ca7514848baad25232f4c254c1e044 Reviewed-on: Reviewed-by: Łukasz Hryniuk <> Tested-by: Łukasz Hryniuk <> (cherry picked from commit 793d1aba304217dcea6707a4b8acf5ac09f62e5a) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-10-02don't hang on busted subdocument offsetsCaolán McNamara2-4/+8
Change-Id: I5d1d18f864496ec98894703f0a22e211a9dd14a5 (cherry picked from commit a2b90cd04733c2ec3b9cb3bb56d95f3298571ecc) Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2015-10-02check stream status and string lengthsCaolán McNamara4-42/+43
(cherry picked from commit 7af19f45b35c428d3e06972806e5a05489f45955) if nSize was 1 with unicode encoding nSize would wrap around in lcl_getMaxSafeStrLen (cherry picked from commit f6368c29bdc3a9017bcae3f064d2cd8c7e37ed10) rework this so we don't read the string, backup and re-read the string again (cherry picked from commit 8523e57e427ef5b0b7f7067dcdd07f01176d2160) Change-Id: I99f3d4a2ec760228f485d01fce856deb9c068431 Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2015-10-02Resolves: rhbz#1264585 check data pilot field name availabilityEike Rathke1-3/+9
Change-Id: Iaadf7044acb7299ee878de2fbc08992447587d62 (cherry picked from commit f09a91630c767370871389c28b81280807513431) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-10-02tdf#76197 Make OfficeMenuBar work again in the start centerMaxim Monastirsky1-1/+2
Regression of 46666a7720e18238b926531a7082dbb8bc524889. The code in MenuBarManager::FillMenuManager merges the addon menu before .uno:WindowList, which doesn't exist in the start center since that commit. As a last resort, let's also check for .uno:HelpMenu (assuming that it's never placed before the Window menu). Change-Id: If45eebe4351c40d8ed69daba527844ffc02e8458 Reviewed-on: Reviewed-by: Jan Holesovsky <> Tested-by: Jan Holesovsky <>
2015-10-02reusing i here from the outer loop is definitely bogusCaolán McNamara1-3/+3
(cherry picked from commit 637ad743bb74a826ddd4db5efbcd33779b9132cd) Change-Id: I4ee52c76b2c1723639185bc99b85d83be5b4fdd7 Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2015-10-02Updated coreAndras Timar1-0/+0
Project: translations 072be829f5db101ae2d78bbf34fd267aeaf95f65 sync translations with upstream Change-Id: I507cf84e5c548a161848bcf0694238ad7c2d8a74
2015-10-02provide libreoffice-writer, libreoffice-calc etc. metapackagesAndras Timar1-0/+7
Change-Id: Ibadbcb45eb0cacd8f26e7bfed3cff794a7ce88f1
2015-09-17update creditsChristian Lohmaier1-1420/+1521
Change-Id: I0de134ec25add0fa963fa73e5583c721a69e17b7 (cherry picked from commit 3834c12cafd645cdfdcf951b5d7c0c0223f3d79d)
2015-09-17tdf#61908 OOXML export cell range for matrix/array formulaEike Rathke1-17/+76
Problem Description: - Matrix multiplication cell formula range is not exported after roundtrip. XML Difference: Original : <f t="array" ref="G5:G6">MMULT(A1:C2,E1:E3)</f> Roundtrip : <f aca="false">MMULT(A1:C2,E1:E3)</f> Solution : Added formula cell range support for matrix multiplication. Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <> (cherry picked from commit beb8e2830dc9e1c771e196fcaf08cdfd6bf3dde3) Conflicts: sc/qa/unit/subsequent_export-test.cxx Omitted test case and document from commit. fix 176 unbalanced XML_f xlsx export failuires regression from commit beb8e2830dc9e1c771e196fcaf08cdfd6bf3dde3 Author: yogesh.bharate001 <> Date: Tue Jun 2 16:39:09 2015 +0530 tdf#61908:XLSX formula cell range is not exported for MMULT. (cherry picked from commit 103b619401f06697255167c788192601e87758b9) array formulas do not consist only of multiple rows, tdf#61908 follow-up For example, {={1,2}*3} is a two columns one row vector, or even a single cell could hold an array formula. (cherry picked from commit 92df7db85a3da10f18a5a06fb53a9cb69910e835) a54ce5ce437e592378fe930b779c518de9670995 14a44ac8356fdffc98b7097f48319755f5f2f317 do not write MM_REFERENCE formulas to OOXML, tdf#61908 follow-up The array range is covered by MM_FORMULA. Excel even complained when loading such a document. (cherry picked from commit f501fe4da88e1d64fcc88a492a52911113d28f6a) Change-Id: Ic871f064a98a324bc16a4253b633c97417c3f900 10e1b19fbfb8ea849ffe3d46504fdf3389633c5f Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-09-17Resolves: tdf#93895 broadcast cell changes when multi-selection was pastedEike Rathke1-4/+12
It is not sufficient to collect the cells, one has to broadcast on the collection. (cherry picked from commit 97ad6393525a928b5dfe2a6562d7604446da7af0) Conflicts: sc/source/core/data/document.cxx Change-Id: I11f889936aff43f958c56789e539809289819752 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-09-17tdf#92586 xmloff: fix import of stretched background imageMiklos Vajna9-2/+51
The bug document has: <style:page-layout-properties ... style:repeat="no-repeat"> <style:background-image ... style:repeat="stretch"/> </style:page-layout-properties> When a stretched background image is set on a page style using the Writer UI, then these two style:repeat attributes always match, but not in the bugdoc. The later used to have priority, till commit 7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step of DrawingLayer FillAttributes..., 2014-06-02). Fix the problem by extending XMLBackgroundImageContext::EndElement(): if we know that the <style:page-layout-properties> sets the FillBitmapMode property, then don't blindly set BackGraphicLocation, but try to overwrite the exiting FillBitmapMode one. (cherry picked from commit 6621da38b3cd217314c2d2295fd1e71be7e1875e) Change-Id: I64ab4363b20cc95003d35acd63ea421472b1c071 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-09-17Related rhbz#1259746: Buffer file content read from GIO UCPStephan Bergmann3-35/+13
...for one, this avoids sending seek requests down the GIO/GVFS stack, which can silently fail with corrupt data read from certain broken servers for current versions of the GIO/GVFS stack; for another, it should considerably speed up loading documents via the GIO UCP, as LO's document type detection is notorious for issuing lots of seek and (small-chunk and/or re-) read operations on a file. (This issue has become more relevant after 51e0d789c344547956764c3b5f0ef5a304f4e0aa "rhbz#1134285: Access dav, davs URLs via GVFS," where the old route via the WebDAV UCP was apparently not affected by those broken servers, so happened to start affecting opening certain remote files in LO via Nautilus.) (cherry picked from commit 93a0696e74e96e5a5ca821f33cb791b87e876f49) Conflicts: ucb/source/ucp/gio/gio_inputstream.hxx Change-Id: I91f91128b2d1a16f976eafeacf216a91747f4df1 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-09-17Resolves: tdf#94249 do not remove broadcasters while iterators are in useEike Rathke4-13/+21
EndListeningContext holds BroadcasterStoreType iterators in its ColumnBlockPositionSet and collects broadcasters to purge them at the end. Removing broadcasters from ScColumn::maBroadcasters in between invalidates the iterators. Hence calling the "normal" EndListening() that removes a broadcaster when all listeners are gone while an EndListeningContext is in use is bad. Change-Id: Ibdd88469e91e6173ceff1f391c23ef7cb7c6f596 (cherry picked from commit e4a8ae0bf54476e9a0c9e1f5348c05f3cd838899) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>