summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-08-28PPTX import: fix missing document metadataMiklos Vajna2-0/+18
Without this, the creation / modification date is lost on import. (cherry picked from commit ef2668bad976f1fbb70759887cafd35ea7833655) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I0b74ac91aee7b8b3e0bc763247086a3a39816bc1 Reviewed-on: https://gerrit.libreoffice.org/11167 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
2014-08-28Resolves: fdo#77516 sub-grid shouldn't be allowed as 0Caolán McNamara1-2/+6
regression from commit 3cb6587abbf6888ac9fb3b0cccc9a5aa0dc29b55 Author: Csikós Tamás <csks.tomi@gmail.com> Date: Sun Jul 7 13:40:53 2013 +0200 modern .ui widgetlayout for optgrid Change-Id: I9e998ce203c16c2303e00347ce6a2992c92cc8dc (cherry picked from commit 4bd317f845c2f3470c7fc354e478be08c2949e0c) Reviewed-on: https://gerrit.libreoffice.org/11164 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-08-28keep nScanlineStride number saneCaolán McNamara1-5/+8
bff + valgrind Change-Id: I255a052251a6a0f1e4005b9cfb3b6ce00c6653ee (cherry picked from commit 35412949a2fb2a4472177a0289de4f0c062b674d) Reviewed-on: https://gerrit.libreoffice.org/11162 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-08-28Updated coreLionel Elie Mamane1-0/+0
Project: translations d02be4f13598d40c2c02b6e97e91002871f5ff58 correct HTML strucutre Change-Id: I5b731612400fd072d3fe287ac556ba23b2ae1fb9 Reviewed-on: https://gerrit.libreoffice.org/11168 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-27Resolves: fdo#83062 infinite recursionCaolán McNamara1-4/+4
regression from commit 7c03fc2fe77f9b1f910f4ab395923e52648c32b5 Date: Mon Sep 2 14:30:09 2013 +0000 Related: #i123048# Corrected connector layout after reload verified that #i123048# continues to work Change-Id: If5fce4b7a88d4d0972f52705334e4b9b48425cca (cherry picked from commit 8d8e8942b2ee2a2e85c65d71628057316c9f5897) Reviewed-on: https://gerrit.libreoffice.org/11149 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-27Resolves: fdo#83137 NULL pActionCaolán McNamara1-1/+1
Change-Id: I74c4e32aae1e3aa74d197f132c900627062b6d01 (cherry picked from commit 72f4f0e9e7db6798ff002632d5bc19b72a671306) Reviewed-on: https://gerrit.libreoffice.org/11144 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-27Resolves: fdo#82904 non-Japanese ww95 documents claiming ms932 encodingCaolán McNamara2-50/+88
look to the individual component commits for clarity refactor into GetCharSetFromLanguage (cherry picked from commit 56c9850145faa9ac04c3f09633e56b6c8c22c6c4) sync GetCurrentCJKCharSet with GetCurrentCharSet (cherry picked from commit 4143d7bc7078fb367130e092a354b20da57585cc) Resolves: fdo#82904 non-Japanese ww95 documents claiming ms932 encoding (cherry picked from commit 47b84f7e5143f445a087fc9ccc4fb29bbd88ff64) Change-Id: Ib638dc8f1daaee3b9920153195e090d8dbc5a798 Reviewed-on: https://gerrit.libreoffice.org/11143 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-27Resolves: icu#11100 resolveImplicitLevels woesCaolán McNamara2-0/+25
Change-Id: I0c052cbcfe375bd1279c2235b53c909920e2e779 (cherry picked from commit 5d952d4208aa61b6bb0c20d36745d0554be7cec3) Reviewed-on: https://gerrit.libreoffice.org/11129 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-27DOCX import: fix handling of embedded DOCX filesMiklos Vajna9-10/+134
The problem was that SwXTextEmbeddedObject::getEmbeddedObject() returned an empty reference for those embedded objects, so the HTML filter couldn't extract their content when it wanted to do so. It turns out the reason for this was that the DOCX importer only handled the replacement image + raw native data for the object. Fix this by creating the embedded object with the correct CLSID and import the raw data into the empty embedded document model. This is similar to what is done for XLSX-in-PPTX in oox::drawingml::ShapeExport::WriteOLE2Shape(), just for the import part. (cherry picked from commit 41aa970b3120837ca9cadb12997a53ad322145a4) Conflicts: writerfilter/source/dmapper/OLEHandler.cxx writerfilter/source/dmapper/OLEHandler.hxx Also squash in 3 fixes on top of that in the HTML filter which are relevant only after the embedded DOCX import is fixed: 1) sw HTML export: don't crash on embedded object without native data (cherry picked from commit 35e954149d976e0e69a9f8b382fc67f5abc5eaa7) 2) sw HTML export: handle embedded text documents (cherry picked from commit 8d670c9452e930460be600212d73e22acd61cc0f) 3) sw HTML export: avoid invalid output for embedded documents When an sw document is embedded inside an sw one, then the inner sw HTML export should just write what's inside the <body>. Add a filter option for that in sw, similar to the one already existing in sc. (cherry picked from commit 8760b2b05c23e5fdf8ad7ad3f447a7489c2ddeac) Conflicts: sw/source/filter/html/wrthtml.cxx Change-Id: Id2cef966c1022ba45a3540bff234029c1d396778 Reviewed-on: https://gerrit.libreoffice.org/11151 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2014-08-27sw HTML export: avoid loosing embedded objects when skipping imagesMiklos Vajna6-7/+76
(cherry picked from commit 971ffe10583dcdd195f429816760bc0acfb6297f) Also squash in 3 fixes on top of that: 1) HTML export: avoid invalid output for embedded spreadsheets When the sc document is embedded inside an sw one, then the sc HTML export should just write what's inside the <body>. Add a filter option for that in sc and use it from sw. (cherry picked from commit 1ee98159f7749b2c1ad47de60a9b3057b9e9720e) 2) sw HTML export: avoid <table> directly inside <p> Wrapping the embedded object output in a <span> at least makes the parser errors go away. (cherry picked from commit 58fc5c6a5153b68470f7de8229b76dca04267ab7) 3) CppunitTest_sw_htmlexport: tinderbox says scfilt dependency is missing (cherry picked from commit 9f482b596195a2948a8f7f14664a7a870d348e95) Change-Id: I308e411e4abb938fe08b47aaf21d6fd747bb758e Reviewed-on: https://gerrit.libreoffice.org/11148 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-08-27bnc#648251: Avoid opening embedded OLE object as "text"Tor Lillqvist2-7/+8
On non-Windows, when double-clicking an embedded OLE object, our glorious content type detection logic detects it as "Text", and opens it as a separate Writer document, which is somewhat pointless. (But at least we don't crash, as we did in the master branch.) Avoid this by checking for a detected filter of type "Text" explicitly, and avoiding the fun code paths in that case. This leads to double-clicks being just ignored. Maybe it would be more useful to produce a "General OLE Error" message box? (cherry picked from commit 46ad54725bf28ea75278eb63dbf95c4a29618c1c) Change-Id: Iae0726b5e9c511a92bdff7229d2978cbf76cb07b Reviewed-on: https://gerrit.libreoffice.org/11139 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-27Resolves fdo#81084 fdo#81696 fdo#80874 fdo#81010 : sort causes crashDeena Francis1-0/+4
Change-Id: I8fb9ec26bc549c264bfbf30177d720b20677b319 Reviewed-on: https://gerrit.libreoffice.org/11102 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit c25ac84688b596b9990d382d550f0514161b78c2) Reviewed-on: https://gerrit.libreoffice.org/11137 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-08-27fdo#83067 also volatile cells need to listen to all referencesEike Rathke1-7/+1
As we now broadcast also cell moves it is not sufficient anymore to add volatile cells only to the BCA_LISTEN_ALWAYS broadcaster, add them as listener to all referenced cells and ranges as usual. Change-Id: I7901b73db7e0c82c4bac302ae746810cbc16ea44 (cherry picked from commit 0792aef9010007d5738723d8930990028bef2f9e) Reviewed-on: https://gerrit.libreoffice.org/11112 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-27out-of-bounds string access, this comparison never matchedEike Rathke1-1/+1
aName == aLinkTabName.copy(nIndex, nLinkTabNameLength) is not a replacement for String(aName).Equals(String(aLinkTabName), nIndex, nLinkTabNameLength) instead use aName.match( aLinkTabName, nIndex) because here nLinkTabNameLength actually is aLinkTabName.getLength() Change-Id: I884f56541f819db5672e9d096a26a3673e82d83b (cherry picked from commit aebcabd54cc5587f3856c48db0a4c4fc0f3f8ce8) Reviewed-on: https://gerrit.libreoffice.org/11133 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-26there is no GLOBAL_CONTENT_TEXT iconCaolán McNamara1-1/+0
avoid broken image in navigator in master document view (cherry picked from commit faa18e9b19e52b611f77ba3ea9818c267ad2346f) Conflicts: sw/source/uibase/utlui/glbltree.cxx Change-Id: I329e12c3c8bc32781340a164213aaf3e4958d4b3 Reviewed-on: https://gerrit.libreoffice.org/11130 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-26bnc#719994: We need the proper alpha maskTor Lillqvist1-1/+1
Change-Id: Ic16dceaca431929238fcef6be31ee95e068b91e4 (cherry picked from commit e06014e0db64ec36ec41dee542d2453c945fddd3) Reviewed-on: https://gerrit.libreoffice.org/11126 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-26bnc#719994: Fix the duotone filter to actually produce duotoneTor Lillqvist1-3/+4
Not sure what it tried to do earlier, but it was obviously wrong. Change-Id: I0b377c4baa88205a9a7ad7c134ec5bc2223e6205 (cherry picked from commit c03f7f2b427f7fe2b94dfb55ea64670426d1a957) Reviewed-on: https://gerrit.libreoffice.org/11125 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-26DOCX import: list styles don't support automatic updatesMiklos Vajna2-1/+2
The problem was the following: setPropertyValue("IsAutoUpdate") on the style failed -> a number of styles was not imported in StyleSheetTable::ApplyStyleSheets() due to the exception, then when we tried to use one of the not imported styles, we also got an exception in DomainMapper_Impl::finishParagraph(), which resulted in not calling DomainMapperTableManager::handle(), so multiple cells of the same table wanted the same range for cell contents, and that resulted in a crash. Regression from cf33af732ed0d3d553bb74636e3b14c55d44c153 (handle w:gridBefore by faking cells (fdo#38414), 2014-04-23), but that commit just made the previously hidden problem visible. (cherry picked from commit 7c02c7b0216f642074b690cce889f1a02a2ef6b0) Change-Id: I788cb6b4a2c7b7efbfa48297c658bb26450bf583 Reviewed-on: https://gerrit.libreoffice.org/11068 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-26fdo#80755 Don't generate thumbnails for encrypted filesMaxim Monastirsky1-1/+3
(cherry picked from commit a75e0f8e4e5f0baa5805d01c5f8edc7b40fceb0f) Change-Id: If52532b8e8ca38e82fd95c13080d521d9cb529aa Reviewed-on: https://gerrit.libreoffice.org/11120 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-26bnc#770711: Make changing table text color in impress always workMatúš Kukan1-0/+2
We set text color for individual characters (in ContentNode::aCharAttribList) and for whole paragraph (in ContentNode::aContentAttribs) too. Problem: when table was loaded in an impress document with font color set, you could not change it by selecting a cell because only ContentNode::aContentAttribs was set, which has lower priority. So, in that case, remove font color character attributes. Change-Id: Ieb0c078481568dcb1739fe35d448c9591f687f2c (cherry picked from commit a217f3cb2dce71a4322f78ceb45edb6f171b2b65) Reviewed-on: https://gerrit.libreoffice.org/11122 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-25fdo#82430: configure: MSVC build: avoid using SSE2 instructionsMichael Stahl8-8/+22
MSVC 2012 for x86 defaults to -arch:SSE2; binaries do not run on any AMD 32-bit CPU, neither on Intel Pentium III. http://msdn.microsoft.com/en-us/library/vstudio/7t5yh4fd%28v=vs.110%29.aspx (cherry picked from commit 8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd) fdo#82430: MSVC 2010 refuses both -clr and -arch in the same command (cherry picked from commit 36ce22f41a754fa405804434899a08a23081e721) fdo#82430: gcc-wrappers: don't stop if REAL_CXX_FLAGS is empty Hopefully should fix MSVC 2010 build... (cherry picked from commit a18ff3d5c75c2b468c48bd19439dee0689d24d67) Change-Id: Ie8253137db2699f2a7fa69c4ac4e7ded90931e3e Reviewed-on: https://gerrit.libreoffice.org/10925 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-08-25fdo#80927 - quickstart causing trouble on windows, disable itAndras Timar1-1/+0
Change-Id: I0c46129cff44edaac72939c1b2bc8cbf02bdf68f Reviewed-on: https://gerrit.libreoffice.org/10817 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-25bnc#880448: Improved handling of placeholder shapesMatúš Kukan2-19/+26
If subTitle placeholder is not found, try body instead of title. And use body text styles instead of title, for subTitle. Also improve PPTShape::findPlaceholder to find placeholder with just nSecondSubType type without the same index. (cherry picked from commit 2a7119021edea8346e4673d57cac3f051a5d0968) Conflicts: oox/source/ppt/pptshape.cxx Change-Id: I470e7268088eb989fb934007dfcf704f67d8cb1d Reviewed-on: https://gerrit.libreoffice.org/11065 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-25Resolves: rhbz#1125588 port LibreOffice to ppc64leCaolán McNamara6-23/+136
Related: rhbz#1125588 first steps for ppc64le almost certainly won't get us too far, but a start (cherry picked from commit 170109708e6a082252efba3d2f1726bbd82b6452) Change-Id: Ic20b97a97b6d506c32322173bd8332d15c3a4555 openjdk appears to use ppc64/server/libjvm.so and not ppc64le/server/libjvm.so Change-Id: Iff9e2e0ac9921b0d9d36a49fdcd2323d5dd124ee (cherry picked from commit 632e4095ad92196480ad82cfa1f106c4c08ae1cc) need to accept ppc64le as a lib64 using platform in ax_boost_base.m4 Change-Id: I86ef068661082addbd165629d3d6905695090a6b (cherry picked from commit 2d48c52da712f8fa3c4a579494c824491afb8515) linux_powerpc64le->linux_powerpc64_le to match dp_platform.cxx Change-Id: Ib63e5a28d7ff12780a1051d94c5976244eab1814 (cherry picked from commit 2ced4d39cc1b8de233cd886d3ef991b3079500d2) Related: rhbz#1125588 get as far as privateSnippetExecutor Change-Id: Icc386083ecd9faefbedebbb9d2496a4eddfa0b2b (cherry picked from commit 4c5bbbf059924f3aa24620a4cbbc35816978a606) Related: rhbz#1125588 get to the end of cpp_mediate on ppc64le Change-Id: Id3928ef5ac68ea13a7aa8723bc8b068ecf8075a0 (cherry picked from commit d8fcd8ca9af087e98a2f6d9cbcf6eb42cddd0c74) Related: rhbz#1125588 force existence of argument save area ELFv2 ABI on ppc64 optimises stack allocation (http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01149.html so we're getting no argument save area This now appears to pass the simple cases and onwards to the tricky ones Change-Id: Ie56d148ebea7fcfc023cb7183bc97f09186e66b4 (cherry picked from commit 6396e18f4d49c24283b170310a1892db40c128d3) Related: rhbz#1125588 ppc64le has new struct passing rules http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01145.html http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01147.html now we just fail instead of crash Change-Id: I329c676337885bcf4fdfdcdb5912d75424862126 (cherry picked from commit 970ad502e3ea2cc992c6cc1c7583231aec5bf5da) Related: rhbz#1125588 ppc64le fix simple struct returning Change-Id: I1e253922fdb606648eff9865f1125a24e35b0d9a (cherry picked from commit ee6fcdd18b1a839d7d60617d4fda622f6e6e7e66) Resolves: rhbz#1125588 ppc64le passes testtools *bzzt*, <lightning arcs, faint smell of ozone>, it's alive! Change-Id: I0b42f4e2603e6d76200d63ab2e26bbb856ae1173 (cherry picked from commit 6ab1951ea2e31f47bc9f211dd9b2681c794b8e7f) Reviewed-on: https://gerrit.libreoffice.org/11072 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-25Resolves fdo#82985 Make generic autocorr files (German/Spanish/Italian)Julien Nabet2-6/+6
I applied a part of the fdo#79276 fix Cherry-picked from a4f411ba62d4fd7fd4a61d1c9d326488d5e84ff5 Change-Id: I4716c06bfd25efe45a19295e0f5fd7cd1b8b0568 Reviewed-on: https://gerrit.libreoffice.org/11086 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-25Revert "--with-lang=ALL build exceeds maximum # of files in CAB"Andras Timar1-2/+0
This reverts commit 3bfac473a1b1dfb2210ec07245e649697679bd83. With Matus Kukan's work, which packs .ui files into .zip archives, file count is reduced dramatically. Multiple .cab files won't be a problem in theory, but unfortunately both .cab files had the same disk id 'DISK1' and it caused problems with MSP patch generation. (cherry picked from commit 29c4a88e01b6892f097c6c1e34649e7011b95fe9) Change-Id: Ie79af3ea30de9f684f7b1fbeb80f0e46ab614b27 Reviewed-on: https://gerrit.libreoffice.org/11095 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-25MSP patchsequence fixAndras Timar1-8/+3
Change-Id: Iaf4a6e5eb8291d78835a391894ba1b1cc675390a (cherry picked from commit f74a6338b3897df49f3041e7ce33453eaba9e2e5) Reviewed-on: https://gerrit.libreoffice.org/11094 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-25fixes related to MSP digital signatureAndras Timar2-2/+4
Change-Id: I06bcf0d2cc8c4915eff3658905087be6a2eadca6 (cherry picked from commit 557cfd3bb1e9eb2792b0aa3831ad107d52ed9909) Reviewed-on: https://gerrit.libreoffice.org/11093 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-25use MSM directly from MSVC dirAndras Timar1-3/+3
Change-Id: I62ebf7f7bc10a81a3949b0aad6e6353619ef6b22 (cherry picked from commit 4f4bd6c852e2daac9ee30957538cf796f9f8e989) Reviewed-on: https://gerrit.libreoffice.org/11092 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-23fdo#80534 bad default value (0) for the number of rowsThomas Arnhold1-0/+1
Change-Id: I39604cf13d1e5714f701dd663ab37a8aed924fa2 (cherry picked from commit 9aede3befb65524d71a2cb8081ded6eb7aa67f55) Reviewed-on: https://gerrit.libreoffice.org/11085 Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org> Tested-by: Joren De Cuyper <jorendc@libreoffice.org>
2014-08-23Resolves: fdo#82747 Crash on opening wikipedia ODT BookJulien Nabet1-0/+1
Test if there's indeed a subnode before testing its type Cherry-picked from 3d34eb4612fa59fae7594399d3d6f798ddb35582 Change-Id: I1bb32652ceb82b0818a8d2cd8d71b46dd96ef2aa Reviewed-on: https://gerrit.libreoffice.org/11050 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org> Reviewed-on: https://gerrit.libreoffice.org/11083
2014-08-22correct references after sort, fdo#79441Eike Rathke6-10/+111
5c6ee09126631342939ae8766fe36083d8c011e3 introduced a different algorithm for reference handling during sort. Unfortunately that clashed with the SC_CLONECELL_ADJUST3DREL introduced a little earlier resulting in relative 3D references effectively being "adjusted" twice. Furthermore, in-sort-range range references to one row (or column) were not adapted to the move at all if the formula within the range listened only to ranges and not a single cell. Added collecting and adjusting area listeners for this. Last but not least, external (relative) references need to be treated the same as internal 3D references, making them point to the same location after the sort. (cherry picked from commit 69adec3ec051ff94f600ab899506ca9d645a8b56) Conflicts: sc/inc/types.hxx sc/source/core/data/bcaslot.cxx Plus necessary parts of 27182231acd3a0c9898a8dba78b76dc8a827b4c0 related to bcaslot changes. Change-Id: I492768b525f95f1c43d1c6e7a63a36cce093fa5a Reviewed-on: https://gerrit.libreoffice.org/10929 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-08-22resolved fdo#82936 do not clear the 3D flag on refupdateEike Rathke1-1/+2
Change-Id: I2ae1368a2ffc20e988ff3ab66590a9f98902b862 (cherry picked from commit 75aad687cb5e63a41303aea568bf68b2b5f15d31) Reviewed-on: https://gerrit.libreoffice.org/11066 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-22fix reading even/odd page breaks from .docx (bnc#519228)Luboš Luňák4-75/+138
We map Word's even/odd page breaks to Writer's left/right page styles. And we cannot just set any page style to be left/right, because that could set e.g. the default page style as such, which would make all normal pages that way. So instead we need to make a copy of the relevant page style, as the original page style as its follow, copy all the properties and headers/footers, and use this copy to get the page break. (cherry picked from commit b32881b6723072c8d1a652ea147d12e75766d504) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: Id0d2568de91ac2de4afb0ba3a6eedd9cec46f878 Reviewed-on: https://gerrit.libreoffice.org/11025 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-21out-of-bounds string accessEike Rathke1-1/+1
... when parsing ='foo'# with no character following. Change-Id: Id65fce721cb47a4d3c947c677323bdcaa2ce957f (cherry picked from commit 07b18860ae03ecb66b5605201f34c2aef3a55ad6) Reviewed-on: https://gerrit.libreoffice.org/11062 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-21write COLOR function with extension namespaceEike Rathke4-3/+7
and add to Excel import/export maps so it survives saving in that format Change-Id: I3a8e07fdd1bded77d4bad60eefffeb0b1dbdd734 (cherry picked from commit 7c6a82d66ebe55fa5ce106bf60f841dd7758d2bc) Reviewed-on: https://gerrit.libreoffice.org/11059 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-08-21fix(?) windows buildLuboš Luňák1-2/+2
Change-Id: Idc57210f23f1a053fc21d47e85206f55704c5880
2014-08-21avoid crash on document ending before contained table endsCaolán McNamara1-0/+2
Change-Id: I003b7e00673cd5a4b4f0ed5218e2d30cfef04ffb (cherry picked from commit 5a2123376dc010ca4e3f0a19d7dbbfaeb25ea963) Reviewed-on: https://gerrit.libreoffice.org/11056 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21gdb: print the SwNodeIndex properly if there are multiple blocksMichael Stahl1-2/+6
Change-Id: I178d365e71ef3377b1a2cfc115bb297640161efe (cherry picked from commit 4f211a0d0c4ef0c248fd3d4493994c1a122c2eb9) Reviewed-on: https://gerrit.libreoffice.org/11045 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21Updated coreAndras Timar1-0/+0
Project: help 888531eda1e60931d7bf6923710cea396de9166d remove conditional text, because wiki conversion fails on it Change-Id: I184d58b0c58feee11010cd174e31641f4dc170ed Reviewed-on: https://gerrit.libreoffice.org/11053 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21add missing parameter flagEike Rathke1-1/+1
in dbgutil build gave: warn:legacy.osl:27022:1:tools/source/rc/resmgr.cxx:701: file:///build/libo/dev/instdir/program/../program/resource/scen-US.res Class: 272, Id: 436. Classpointer not at the end! Resource Stack Class: 272, Id: 25044 and the following value of the suppress flag was taken in place of the parameter flag, which was identical and didn't harm in this case, but ... Change-Id: I951381ef2a5c2d7d7d44892ad5c34ea77ace51ce (cherry picked from commit c08fea639ca1a757df086ffe34f2bd5cf6573b6c) Reviewed-on: https://gerrit.libreoffice.org/11058 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-21bnc#529470: I can't remove a path in AutoText dialogTor Lillqvist1-5/+31
This is, not surprisingly, somewhat weird code, but I think this patch does what is necessary, it does fix the bug. Change-Id: Ie1947b311f1455ba48a904f5ef42ad92899fac31 Reviewed-on: https://gerrit.libreoffice.org/11031 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-21Fix showing calc/draw types in some file pickersMaxim Monastirsky12-12/+12
Having the same UIName for several filters, causes some file pickers (gtk & generic) to drop the whole group. Change-Id: I6d18a751cb77a6a83e8e2a46338e41b7c72180ff Reviewed-on: https://gerrit.libreoffice.org/10730 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2014-08-20sw: ww8: fix another ~SwIndexReg() assertionMichael Stahl1-2/+4
If the position is the same as the body text anchor position, don't delete the node. Probably something should have inserted more nodes between StartApo() and StopApo(). Change-Id: I41110a47d840e764f6d2a24e43bf6938b1282972 (cherry picked from commit 404f16e97f1c2fcd8f9a1297bdfa46cba970467e) Reviewed-on: https://gerrit.libreoffice.org/11046 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-08-20Resolves: fdo#79227 labels are truncatedCaolán McNamara1-4/+2
Change-Id: I9d5cd9491325aab6c844c889bf4db6baab2e75c8 (cherry picked from commit 71804294c79136ef43a8f91b5c961e266d32187a) Reviewed-on: https://gerrit.libreoffice.org/11043 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20fix crash on loading ooo83574-1.docCaolán McNamara1-3/+5
Change-Id: Ia959dde8bac2d663cf1a5bec0358ee89dcaf42ed (cherry picked from commit 17ccc09ec27bde00e5ed7a9fe6055a991992b0ed) Reviewed-on: https://gerrit.libreoffice.org/11038 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20fdo#82427 disambiguate "NOT LIKE 'foo'"Lionel Elie Mamane1-2/+2
Change-Id: Iab383639ea73cc87c03f4f42433bc9ccfcd988ef Reviewed-on: https://gerrit.libreoffice.org/11008 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20guard against division by 0Caolán McNamara1-12/+17
valgrind + bff Change-Id: I5fa40f7a9759c98bb70ee6eb854dd9b376401f89 (cherry picked from commit 1ab0e8717bee9fee6c42015647bccfbf1683b8fc) Reviewed-on: https://gerrit.libreoffice.org/11036 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20only subtract height of hscroll if visibleCaolán McNamara1-2/+5
otherwise infinite loop in extensions update check Change-Id: I0dbf4f34208f1bf0854e365006a79470b26571f3 (cherry picked from commit 749f7548b4ee746d69c20a828ea6d3b853eba8d3) Reviewed-on: https://gerrit.libreoffice.org/11033 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-08-20fdo#82757 call convertStringToNumber and detectNumberFormat with same localeLionel Elie Mamane1-1/+18
So that they agree (among others) on date recognition patterns. Change-Id: I964142702b5bb23bca2c62433e52f76dfa4bdacb Reviewed-on: https://gerrit.libreoffice.org/11003 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>