AgeCommit message (Collapse)AuthorFilesLines
2015-02-10Bump version to 4.2-24cp-4.2-24Andras Timar1-1/+1
Change-Id: I1acff9fe3e907b303851984674da33dff5ed0e08
2015-02-03fdo#67534 Fix "Property Handler" shared lockMaxime de Roucy1-0/+18
As explained in the following link, access mode should be set to "EnableShareDenyNone" to avoid blocking others process to access the file opened by the Property Handler. Reviewed-on: Reviewed-by: Michael Meeks <> Tested-by: Andras Timar <> Conflicts: scp2/source/winexplorerext/registryitem_winexplorerext.scp Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3
2015-02-03Related: fdo#88455 crash using delete in available fieldsCaolán McNamara2-8/+12
Change-Id: I4ac5fe6f42b425ee96124b2dde39ff397a081638 (cherry picked from commit 1746c886362b8525b04365dd6b7203b8098b99ba) Reviewed-on: Tested-by: Markus Mohrhard <> Reviewed-by: Markus Mohrhard <>
2015-02-03Resolves: rhbz#1179642 crash in GetFocus with empty mpPreviouslyFocusedListBoxCaolán McNamara1-2/+3
Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76 (cherry picked from commit dae7d2089516d9cf014b9fad0adb484f19282a29) Reviewed-on: Tested-by: Markus Mohrhard <> Reviewed-by: Markus Mohrhard <>
2015-02-03Resolves: fdo#75565 reduce block on pasting rtf like we do for htmlCaolán McNamara1-1/+2
Change-Id: I74a9748a2e4981dc5d1677f06db7eceed9e4b108 (cherry picked from commit 0efbd9931ea854cf71c4c54ca3f3d55d6db1fa13) Reviewed-on: Tested-by: Markus Mohrhard <> Reviewed-by: Markus Mohrhard <> (cherry picked from commit a0ef7698b7df63b8befe274305051063425f8eb6)
2015-01-31fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.Tomofumi Yagi1-2/+2
GetEnglishSearchFontName() returns incorrect value for specific localized font name as parameter(ex."HGS Gothic M"). Because, the conversion table "aImplLocalizedNamesList[]" is wrong. This causes the assertion from vcl/source/font/PhysicalFontFamily.cxx(line:297), and more problems, probably. This patch fixes two entries in the conversion table. One fixes the assertion, another fixes typo. Change-Id: I3141bbbb7956608cc59f20ad42c76ef97a42189d Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250) Reviewed-on: Reviewed-by: Andras Timar <> Tested-by: Andras Timar <>
2015-01-27Bump version to 4.2-23cp-4.2-23Andras Timar1-1/+1
Change-Id: Ica66c89fe86c18c436290a03849aa5ebfb4e8bc3
2015-01-27tdf#88051 fix Graphite layout at Linux Libertine G ligature followed by tabLászló Németh1-1/+1
Change-Id: Iecedb87f6329c1cddcaa4cd939b349924e58d256
2015-01-27Resolves: fdo#84943 make fodt non crashy like odt for formulas inside shapesCaolán McNamara1-7/+11
where odt checks for a null pTxtCrsr and skips the object and fodt just ploughed ahead. i.e. make fodt equally useless as odt (fdo#84942) (cherry picked from commit 4345a3de0e5a600685fef5dc9fa422fe6849a0a3) Conflicts: sw/source/filter/xml/xmltexti.cxx Change-Id: I915cc1f7c065ea83377e895a932636c82698cf1f Reviewed-on: Tested-by: Michael Stahl <> Reviewed-by: Michael Stahl <>
2015-01-27Resolves: fdo#87601 specific html doc hangs on loadCaolán McNamara2-1/+101
Change-Id: I67f472d72efe123b533d4d94be0084986c0e8349 (cherry picked from commit 6acd5c45c764d81aea1539e66adbfadb51df0aa3) Reviewed-on: Tested-by: Michael Stahl <> Reviewed-by: Michael Stahl <>
2015-01-27Resolves: fdo#88735 crash after calling sort after subtotal removalCaolán McNamara1-1/+1
Change-Id: Ia30271426ea47b7bf5af85d16591a02e6d52b3d9 (cherry picked from commit 0442cd217645aa4fdd924e4c2e4f90a77f1fbbad) Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2015-01-27Resolves: tdf#81124 crash on setting autofilter on column with no contentCaolán McNamara1-1/+2
Change-Id: Id53e589789144d892427a8a4ec1af1926aa97b52 (cherry picked from commit 3a5fa612b4afb72b5f91877a5c52e25c7604ae1a) Reviewed-on: Tested-by: Markus Mohrhard <> Reviewed-by: Markus Mohrhard <>
2015-01-27Fix a single quote slipped inTakeshi Abe1-1/+1
See void SmNodeToTextVisitor::Visit( SmFontNode* pNode ) for comparison. Change-Id: Id7e58fef3b715ef2a4bcb4e1a1d390aadf917b5f Reviewed-on: Tested-by: Jenkins <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit 9efb04dfbf70e123da1755adcede8199eabf0d9a) Reviewed-on:
2015-01-27coverity#1266508 Useless call (gold)Caolán McNamara1-2/+1
regression from commit 832e5aadbff006ec24959162c29756fe2b1982be Author: Caolán McNamara <> Date: Tue Oct 8 10:06:59 2013 +0100 Related: fdo#38838 remove UniString::SearchAndReplaceAll (cherry picked from commit 6cde3ff3dd646f51f37f2342863371db8de9087a) Conflicts: sw/source/filter/html/wrthtml.cxx Change-Id: If792925eddc9c640584a2e8fa313a4297a32c74c Reviewed-on: Tested-by: Markus Mohrhard <> Reviewed-by: Markus Mohrhard <>
2015-01-12Resolves: fdo#87015 image missing from docCaolán McNamara3-9/+35
regression from commit e0cce521f1ad0cc384d30ce2f1077ea229fffe62 Author: Armin Le Grand <> AuthorDate: Thu Jan 10 16:28:40 2013 +0000 Commit: Caolán McNamara <> CommitDate: Thu Jun 13 14:50:46 2013 +0100 Resolves: #i121504# Support for alpha channel in clipboard for all systems (cherry picked from commit ef3931ff410117e1237b3bef7bc090e8b83b9519) which blindly just bulldozed out the bMSOFormat branch (cherry picked from commit 470fcca594ba4f6bf473d4d44b415c2ba151b0d9) Conflicts: vcl/source/gdi/dibtools.cxx Change-Id: Iec354f1fb585f0803b9df472bc9ec9e103aa5847
2015-01-08Bump version to 4.2-22cp-4.2-22Andras Timar1-1/+1
Change-Id: Ib43b42caac84aa0218be5944b2b4f808860da9c0
2015-01-08avoid use of ref. to possibly deleted objectDavid Tardon1-1/+1
Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69 (cherry picked from commit ce5cc7afb0f1c99237d04e0c754527c725d8491c) Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2015-01-08fdo#79269: fix ODF import of style:footer-firstMichael Stahl4-15/+55
The implementation of SwXStyle's FirstIsShared property is busted, and that causes xmloff to write the footer-first content into the master footer. This is a re-implementation of 0f21f932081471b2a5eda820fa1a194fbf3ab85c because unostyle.cxx is very different on master... Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <> (cherry picked from commit 902de8a1cbdb86c1eb1a05c8307b109fd75f493c) Conflicts: sw/source/core/unocore/unostyle.cxx Change-Id: I485d8089c1fb5ba3ca369fbfe8f3115bf700ba13 Reviewed-on: Reviewed-by: Björn Michaelsen <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2015-01-08fdo#79249 call formula compiler with error stringEike Rathke3-10/+18
... instead of attempting to stringize a NaN coded error value. Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb (cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6) construct grouped ScFormulaCell with bDirty=true, fdo#79249 related Noticed when loading with fdo#79249 fix where oox::xls::applyCellFormulas() groups the consecutive =#N/A formulas. Only A1 result was displayed, other cells were displayed empty. (cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993) correct error string, #N/A instead of #NA (cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac) implement an actually working setErrorCell() from BIFF error codes (cherry picked from commit ca9a81b2ca858b82e863e1e6f917928916fea79e) 3a541f74d3d25e1515a1c6d47f02ec6a8e817c93 15019072b6e812b9ffe29d3ee6afacd9ab526948 67b8fc324779875ba14e2d69204c40fe27cc180e Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> Conflicts: sc/source/filter/oox/sheetdatabuffer.cxx Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b
2015-01-05valgrind: uninitialized readCaolán McNamara1-0/+1
on loading id:000386,src:000000,op:havoc,rep:128.jpg as text Change-Id: I98364ffbcc4ea788613cc8071c4d8774ba167033 (cherry picked from commit 0b39d560da27ece227830a4bcc5556ae902a0921) Reviewed-on: Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
2015-01-05valgrind: initialize theseCaolán McNamara1-3/+3
Change-Id: I6440832fe508689ffa8e20fa17827528331e3585 (cherry picked from commit 2645b1979365085edf4a94500f2c610bfc4e668b)
2015-01-05check size before looking into the stringMarkus Mohrhard1-1/+3
Found by Asan. e.g moz233272-2.xpm Change-Id: Ic563db41dbd4ce7250492e99f3e48a203cfdcf00 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit ba4b5741db25ff3b76a8d10d8f3745dfc1973749) (cherry picked from commit cda3b8767fd8f5b43b1043852e9f90fd17a129f4)
2015-01-05asan wrt mandriva57054-1.tiffCaolán McNamara1-6/+5
Change-Id: Ibb7ecfa637ff96fbda3a8ed5d67943ece28927e5 (cherry picked from commit f901624b5e13e300f8e2facd2a824202c21d9729) Reviewed-on: Reviewed-by: Markus Mohrhard <> Tested-by: Markus Mohrhard <>
2015-01-04reimplement shared formula import for xlsb, fdo#86734Markus Mohrhard4-12/+30
(cherry picked from commit e1351ed4c5f9152c80b32bbaa53e3eff56671331) Change-Id: Ic5d678a2b1197ce8d83b308b0a4387bf657052d5
2014-12-30use the correct tab for sheet local names, fdo#81195Markus Mohrhard1-2/+2
Change-Id: I7e8b7ed552a37c6d9c6ce7c75765267b343d508c
2014-12-30relative refs wrap around in xls, fdo#84556Markus Mohrhard2-7/+16
Change-Id: If84d468d4bd55ed55ccd517d0b078d283a1a9c38
2014-12-29handle relative refs correctly in xls import, fdo#80091Markus Mohrhard1-2/+5
Change-Id: Ia70f96e1d31e71c56f03c828be0a4e49fff4b198
2014-12-22bnc#862510: PPTX import: Wrong text color inside shapeZolnai Tamás3-5/+48
When theme index is 0, it means it's unset so we should not apply that. (cherry picked from commit 89206c472ecf18bfde6824cea8004921cd404365) Conflicts: sd/qa/unit/import-tests.cxx Change-Id: I62a9cd2a9b4c19f5acffc334d5e8263fe24fc8fd
2014-12-22fix OOXML validation errorsMarkus Mohrhard1-0/+6
Change-Id: Ieac082a3b312602eff5ec101529536d747fa3836
2014-12-19resolved fdo#86809 connect filter conditions correctlyEike Rathke1-3/+10
Maybe since 0960ec3e1b7b0d872d1f84d2d56f480a4df08b21 all conditions of a single filter stack were OR connected, regardless whether filter-and was given in the file. Change-Id: Ifb423ccc7deb42bb6bba0bfc810607633f2c342c (cherry picked from commit b500e60b32b5cf8fd61beb7476c2c29e65aee3e4) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2014-12-18Bump version to 4.2-21cp-4.2-21Andras Timar1-1/+1
Change-Id: Id9a052e61b0c098ff9e843b04e738fc1daa3a7c7
2014-12-18fdo#68385 update references only if cut originates from the same documentEike Rathke1-5/+10
Change-Id: Ia7b27309251cf9e47505c58d8ed0172d134280f4 (cherry picked from commit f2ac9fab2677a6a718f251baef75d3cae96d1f01)
2014-12-18fdo#79249 call formula compiler with error stringEike Rathke3-3/+8
... instead of attempting to stringize a NaN coded error value. Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb (cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6) construct grouped ScFormulaCell with bDirty=true, fdo#79249 related Noticed when loading with fdo#79249 fix where oox::xls::applyCellFormulas() groups the consecutive =#N/A formulas. Only A1 result was displayed, other cells were displayed empty. (cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993) correct error string, #N/A instead of #NA (cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac) Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b 3a541f74d3d25e1515a1c6d47f02ec6a8e817c93 15019072b6e812b9ffe29d3ee6afacd9ab526948
2014-12-18resolved fdo#87237 propagate error values through matrix comparisonsEike Rathke2-45/+53
Apparently introduced with 8e8b43a03e77dd251876c1de0ac06eeeb09192cd the comparison results were stored as boolean values, effectively discarding any infinite double values and error values encoded as NaN values. (cherry picked from commit 3c405ff82fcc9f8f044833420485c54658064636) Change-Id: I1fb6f46894a0bee02a37e28b7e6cc84f8c051f28
2014-12-18spell dialog: Make [Close] work in protected documents with editable fields.Jan Holesovsky1-5/+9
We have to call ToggleChildWindow directly; calling SfxDispatcher's Execute() does not work here when we are in a document with protected section - in that case, the cursor can move from the editable field to the protected area, and the slots get disabled because of SW_DISABLE_ON_PROTECTED_CURSOR (see FN_SPELL_GRAMMAR_DIALOG in .sdi). (cherry picked from commit 08e0a79aeba6fd41cbb51de3be48659619f27206) Conflicts: cui/source/dialogs/SpellDialog.cxx Change-Id: I1c310c028aaaf774431d0b1e6bba10e901a8166d
2014-12-15no separator really means no separator, fdo#83027Markus Mohrhard1-2/+1
Change-Id: I612a46701e7447db63f38ed709e8693d0533710d Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2014-12-12PDF signing feature backported from 4.4Tor Lillqvist1-7/+7
Cherry picked from: 840f75065918c4584fa9159fdc90242b5374ab37 1fe9ee73a758603ee0e1465931352c41ef8bd999 d8a8ff8177df628636d80c4dc1d8f597f6677dfc bfa01d8a8248f7e44675de5ed1f85a1d17105022 bbb18f679f5a50e9c709520d6c3260d3d9db5aa9 c4cc31b5b55019aabad4045c8174b45e1b27073a 7e3c931786c3cbe83ee170b8b0746d141b520ce6 070c93af73df9aa4eb333265c81060d123b530b9 6e91763769a562b88882a4c2a94b1367c6ed4866 Change-Id: Ib4b67eec0fb7f032a395b5463b481a5680287768
2014-12-12fdo#37814: SHCreateItemFromParsingName doesn't like LO's file URLsStephan Bergmann1-13/+25
...but apparently wants pathnames instead, cf. the other use of it in WinSalInstance::AddToRecentDocumentList (vcl/win/source/app/salinst.cxx). Change-Id: Iaa64ff82915f7cbfee55b4389387b226f7adc919 (cherry picked from commit e123ffd66088783ce74a7b5f15e9d324b39ecf67)
2014-12-11PDF signing feature backported from 4.4Tor Lillqvist77-385/+235
fdo#83939: Check return value from pPDFWriter->Emit() Change-Id: Id492b1b6b9d534276c155b1e46953d098ce8b969 fdo#83939: Add new error code for failed PDF signing, and handle it Conflicts: filter/source/pdf/impdialog.hrc filter/source/pdf/impdialog.src Change-Id: Ide6dc06d33faea795272d9d32fc028ac8d023c5a fdo#83939: Set error code if signing failed Change-Id: I45f1077c744e20a369a73bf0b83c8dba04ddcda7 Use the "vcl.pdfwriter" logging tag instead of "vcl.gdi" Change-Id: If53448ccfd0c156d4971ba994173b2d92af50138 We want PDF signing to be non-experimental now Change-Id: Ic02d1f5169197edd8f9793befd45adf5db145a3b Bin noise comments Change-Id: I084040ff90ee30aa83ac5d3ad11365768272ec65 Bin noise comments and superfluous blank lines Change-Id: Idec496b778d708fb6fa4c004329f8e734276052a Remove noise SAL_WARNs that were not warnings, just informative messages SAL_DEBUG is what should be used for stuff like that (and not committed). Change-Id: I08505418bf9b55082e0d7672b85f3f76262dbad0 fdo#87030: PDF signing using Windows API, work in progress Started writing a Windows version of PDFWriterImpl::finalizeSignature(). The certificate we get from the selection dialog (in xmlsecurity) is from the Windows built-in store anyway, so it is pointless to try to use it with NSS. (See bug for longer discussion.) So far it was pretty straightforward. The WinCrypt API seems clean and easy to use. But for some reason the CryptSignHash() call fails with "Keyset does not exist" (NTE_BAD_KEYSET). What am I missing? Anyway, comitting this now as it does compile and doesn't make things worse. Change-Id: I0941995ad6e22c5487c6e6fe0084d3df0b2341c7 fdo#87030: Prevent PDF signing using Windows API from failing There was one details that I had missed in my initial coding: CryptAcquireContext() doesn't give you a HCRYPTPROV key container that would contain the private key of a public key certificate. For that you need to use CryptAcquireCertificatePrivateKey(). When the hash has been created using such a HCRYPTPROV, the CryptSignHash() call succeeds. The certificate in DER encoding that is passed in from the caller, obtained in the certificate chooser (in xmlsecurity), is possibly not good enough to be used for the other things. So look the same (?) certificate up in the user's key store instead. At least more properties are present in the certificate when looked up like that. Add more SAL_INFO logging, with cleartext dumping of certificate context property names and list of algorithms supported by the CSP. Unfortunately, even if all the WinCrypt API calls now succeed, the signatures we produce still are not good enough for Adobe Reader... A lot of information must be missing, they are quite short, just 256 bytes. Change-Id: Ifa4dd37b6d40932fcdcbb07e00c9eb52d54a5477 fdo#87030: Generate a proper PKCS#7 signature The signature should be in DER-encoded PKCS#7 format and what CryptSignHash() produces is nothing like that. Luckily CryptSignMessage() is actually almost easier to use and is capable of doing what we need. This also means that we won't need any HCRYPTPROV or HCRYPTHASH after all so all the code related to that can be removed. CryptSignMessage() handles both calculating the hash and signing it. One less than ideal issue with CryptSignMessage() is that it needs all the data to be hashed and signed at the same time, so we need to keep both buffers around for signing. It also turns out that we don't need to look up the certificate anew from the user's certificate store after all. Now Adobe Reader doesn't complain any longer about the signature's format and contents. Change-Id: I25cfb93b516ffa723c6228d068d9ffa8e7cc4790
2014-12-11do not save UNO marks in undo historyLuboš Luňák1-4/+6
These are usually very short-lived marks that are used for various internal purposes or by UNO interfaces, so restoring them from undo history does not make any sense. It can in fact lead to a crash on undo if the mark has been already deleted (which is usually the case with UNO marks) but the restoring still refers to it (this is not a problem with other mark types since those should be deleted only when they are no longer in the document, in which case they are saved in undo history by content positions rather than mark references). Change-Id: Id707dc3d2b888b5c96a974d04a0ef17b22fc024c
2014-12-08don't update range name if ref not in update range, fdo#85304Markus Mohrhard1-0/+3
Change-Id: I1ccfacd98bd10f6ae1d4eaf7a705fe8863045697
2014-12-08we need the SdrPage for deleting the notes, fdo#86166Markus Mohrhard3-0/+11
The SdrPage that contains the shapes for the note captions is deleted before the notes. Prevent that case by deleting the notes before deleting the SdrPage. Change-Id: I13727cea7df0b033fb386a6a8e20dcadec743335
2014-12-08correct order of xml elements, related fdo#45266Markus Mohrhard1-1/+1
Change-Id: I03ea0e5bb064222e50dc08a682091ec3e23bf11d
2014-12-08remove invalid attribute that is not read anywayMarkus Mohrhard3-4/+0
Change-Id: Id7770ffda49ba7bc0ebc780c67c56b81152213f7
2014-12-08the xlink:type attribute is mandatory, related fdo#79449Markus Mohrhard1-0/+1
Change-Id: I03c4217f786bc10aa915780dc10ea52d94019b6e
2014-12-05fdo#86795: xmloff: ODF import: do not import checkbox fieldmark ...Michael Stahl1-15/+34
... if it has start/end, because Writer will become grumpy and crash. (cherry picked from commit 25fd11e78279aef5a6b7656347758e5c67a9c45a) Conflicts: xmloff/source/text/XMLTextMarkImportContext.cxx Change-Id: I6024051249eeac6ed9e43856fa77db969287f888
2014-12-05fdo#58112 write loext:contextual-spacing accept style:contextual-spacingEike Rathke1-2/+2
Change-Id: I3e6698d9d9399dd5a13658641847df8a5f34f6ae
2014-12-03Revert "ODF export: don't write invalid "group-name" attribute"cp-4.2-20Andras Timar5-12/+10
This reverts commit 53824b05f99ac7c68e6d48b53e2bd98c0fe274c7.
2014-12-03Bump version to 4.2-20Andras Timar1-1/+1
Change-Id: I9838eede17e52ba377f072f967acf65f081d1985
2014-12-03fdo#86762 re-establish listeners to move cell broadcastersEike Rathke11-94/+219
... for UpdateReferenceOnSort=false (cherry picked from commit 6c2111f17089eb667bf526561d7667d17825e822) Conflicts: sc/source/core/data/table3.cxx fdo#86762 broadcast also empty cells after sort (cherry picked from commit 08793e08c7e9cefe594c49130f782725e386c463) Conflicts: sc/inc/column.hxx sc/source/core/data/column.cxx sc/source/core/data/document.cxx sc/source/core/data/table2.cxx sc/source/ui/docshell/dbdocfun.cxx fdo#86762 re-establish listeners on moved broadcasters ... also in SortReorderByColumn() similar to SortReorderByRow() (cherry picked from commit e119f3883513aeaa49f332362620e955dc8b453f) Conflicts: sc/source/core/data/table3.cxx e275a754c530d6039ed14304900dd71416f36e46 7665dcc90d70fcf3b08bef0adb9ab6aaff1cdcdf Change-Id: Id90288660e317d6e47ee01ee3b5ff9058cfa18df Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>