summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-16REINSTALL ALL when patching, I found no other way :(suse-3.6-5Andras Timar
Change-Id: I6cc9aef5668521ab4adc3302e35e3ba6dc66f09b
2013-01-15Bump for 3.6-5Andras Timar
Change-Id: Ib941bc26d51f5f150a2de83d8ad203cb177a6bf2
2013-01-10implemented EmfPlusRecordTypeFillPie recordRadek Doulik
Change-Id: I15e7464a6a295bb4c1313c0a65ee33b6443c61c8
2013-01-08n#793998 sw: add TabOverMargin compat modeMiklos Vajna
In case the right margin is larger then the tab position (e.g. the right margin of 7cm, there is a tab position at 16cm and right margin begins at 9cm), we have a conflicting case. In Word, the tab has priority, so in this conflicting case, the text can be outside the specified margin. In Writer, the right margin has priority. Add a compat flag to let the tab have priority in Writer as well for Word formats. This is similar to TabOverflow, but that was only applied to left tabs and only in case there were no characters after the tabs in the paragraph. (cherry picked from commit bdfc6363d66aa079512cc8008996b633f693fed1) Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/inc/doc.hxx sw/source/core/doc/doc.cxx sw/source/core/doc/docnew.cxx sw/source/filter/xml/xmlimp.cxx sw/source/ui/uno/SwXDocumentSettings.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: Ib07abd5db1daa916b8b4d9530d09d4d0c4af026e
2013-01-04n#793262 DOCX: import w:tcMar inside w:tcMiklos Vajna
These were ignored previously, and in case they contained some margins, the resulting table was potentially smaller than necessary. (cherry picked from commit 672de66ff8ad6d1fbf8a198ee518c996611b9e2d)
2013-01-04n#793262 fix DOCX import of last empty header/footer para char propsMiklos Vajna
At the end of the header/footer import, the last empty paragraph was removed. In case the last but one paragraph was empty, but had character properties (e.g. a custom font size), the removal changed these, and used the character properties of the last paragraph instead. Simply dispose the last paragraph, this way character properties are always kept. (cherry picked from commit e8b661dd0aed9b35104e910acbb814748a2c3af0) Conflicts: writerfilter/source/dmapper/DomainMapper_Impl.cxx Change-Id: Ic78f197fe99458becb9d86901bee6dfcb7076a13
2013-01-02fdo#47466 FORMATTING: Autoformat empty rows causes app to crashJulien Nabet
Thank you John LeMoyne Castle for your support http://nabble.documentfoundation.org/Wrong-indentation-which-leads-to-segfault-in-sc-source-ui-docshell-docfunc-cxx-td4026726.html However, the weird thing is I reproduced the crash with master sources but didn't with 4.0 branch nor with 3.5.4.2 Debian packages Change-Id: Ia5366f479a1066106551b77b5a6315fb78e1bf7d
2013-01-02n#793401, fdo#53175: Don't load the default values of the styles in writerfilterCédric Bosdonnat
...or we may have some additional properties set on some styles. (cherry picked from commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a) Conflicts: sw/inc/IDocumentSettingAccess.hxx sw/inc/doc.hxx sw/source/core/doc/doc.cxx sw/source/ui/uno/SwXDocumentSettings.cxx writerfilter/source/filter/ImportFilter.cxx Change-Id: I5a5d307931a2a6c1f25bd2da93381d8de65c2480
2012-12-21fdo#58142: fix frame selection in SwPageFrm::GetCrsrOfst:Michael Stahl
The function does not handle the case where a paragraph was hit but no background frame was hit properly, which may or may not (depending on the platform) cause it to return a position of a frame when that is undesirable, such as when called from SwWrtShell::UnSelectFrm(). When UnselectFrm() leaves a frame selected pasting multiple pictures leads to a crash. (regression from e8fbe97900f13305b17015d9044993bde4adab36) Change-Id: I3604825f654c523a37f47a9fc660647d8b3e7077 (cherry picked from commit 2fc4af311656e7d019ca802d23444e5161f820ee) Reviewed-on: https://gerrit.libreoffice.org/1314 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-12-21Resolves: fdo#49587 apparent loop in style hierarchyCaolán McNamara
Change-Id: I32317a1a6500377f7e7bb98d1dcc65ad86feb9a2 (cherry picked from commit 7e3923520c27ff139bc3abab35a1c01e1a785fb1) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-12-21fdo#57780: sw: lcl_ArrangeLowers: register drawing ...Michael Stahl
... objects at the right page. This was effectively disabled for all anchor types except FLY_AT_PARA by a misplaced ! in the conditional, and C++ not being a type safe language. Change-Id: I64af2141e577ac896292eecd9f8c46c62a0548db (cherry picked from commit c479ccc438edeb7197a2d05bdb99067365d7bac0) Reviewed-on: https://gerrit.libreoffice.org/1290 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2012-12-21fdo#52240 added [hr-HR] date acceptance patterns D/M/Y;D/MEike Rathke
As per https://bugs.freedesktop.org/show_bug.cgi?id=52240#c59 (cherry picked from commit b1184f8a4e4a3949d38407c5f1d5155c2c2b42d5) Change-Id: I83afc59e4ac71b18219ace60dcbcabafebd5b525 Reviewed-on: https://gerrit.libreoffice.org/1288 Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com> Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-12-21fdo#52240 added [no-NO] date acceptance patterns D.M;D/M/Y;D/M;D/M YEike Rathke
Also referenced by nb-NO and ny-NO Changes as per http://erack.org/blog/archives/18-comments.html#c351 Change-Id: I9e07f4307800e99fdff21bccde91af4178b244f3 (cherry picked from commit 638993d9b80b3793dfd31db0dacba3746ceb98fd) Reviewed-on: https://gerrit.libreoffice.org/1287 Reviewed-by: Kohei Yoshida <kohei.yoshida@gmail.com> Tested-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-12-21Resolves: fdo#51638 In "unopkg gui" dispose component context from DeInitVCLStephan Bergmann
...the same way it is done in soffice.bin. framework's Desktop::dispose() requires the solar mutex to be still alive, which is destroyed in DeInitVCL, so if the component context/service manager is only disposed afterwards, the solar mutex is already gone. This required moving disposeBridges() around, but it allowed to get rid of DisposeGuard. (cherry picked from commit 37cc83e594fa8ca131fc5fb98506287b7daedffd) Conflicts: desktop/source/pkgchk/unopkg/unopkg_app.cxx desktop/source/pkgchk/unopkg/unopkg_shared.h Change-Id: Ibec3d19040fdae23f492cd1e29084e673403e00b Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2012-12-21fdo#55289: fix crash in SwXShape::setPropertyValue:Michael Stahl
In the libreoffice-3-6 branch the docx import crashes here when setting the anchor position of a shape, because the previous setting of the AnchorType was not done properly: the position of the anchor in the SwFmt did not match the actual position of the text attribute, so we get these assertions: "Missing FlyInCnt-Hint." and crash. This cannot be reproduced with the docx import on master, because on master a different intermediate AnchorType is set, and transitioning from that happens not to cause the crash. But it can be reproduced with a unit test. The regression was introduced in libreoffice-3-6 with backport commit bbbb10a0774b9da546557632cd09c4f6958f8939. Change-Id: I394643e11862543177ba57958a26cd8ce06dc09c (cherry picked from commit 01cd24df1ec7eaa53e9e2156d4d6890a7cc5996a) Reviewed-on: https://gerrit.libreoffice.org/1264 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-12-21handle properly anchor transition at page->at paragraph->as characterLuboš Luňák
Otherwise setting text range afterwards crashes with pHnt being NULL. Change-Id: Ib4ac2712c061605dcaaa262280c0307f7a9af2ce (cherry picked from commit 5de61f7a4ddb502730454e4bf3232f7f4b4175e1) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-12-21fix incorrect OSL_ENSURE -> SAL_WARN_IF conversion (condition not inverted)Luboš Luňák
Change-Id: I57dfa64c55e046ed51797b2abeb7ba3242e637da (cherry picked from commit dfc4832049c140b7442c085062599aef1953e8fd) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-12-21Resolves: fdo#57532 restrict page sanity check to non-storage chunksCaolán McNamara
Change-Id: I47c24131e95b9a8a691dbff4710869ba91df8306 (cherry picked from commit 4a1044229afd6b52ca10e5c55f1957b153a8c6ea) Reviewed-on: https://gerrit.libreoffice.org/1245 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Tested-by: Michael Meeks <michael.meeks@suse.com>
2012-12-21fdo#52640 fix right-aligned tabstopsDavid Tardon
It is no good to change temporary object... Change-Id: Ib1178e154341dd0216fd965d3ed6c264de40d634 Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-12-21fdo#54473 fdo#57133 fix RTF import of character stylesMiklos Vajna
Regression from commit d2d77fd86e6cb7341e113557e2cfe3d7948759bd (cherry picked from commit 41890bf714803969515578b47e63fa9730ea7090) Change-Id: I7accc5c383de3fa53c12527766c3fc155bfa9863 Reviewed-on: https://gerrit.libreoffice.org/1235 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-12-21Resolves: fdo#56549 crash in format->autocorrect->apply and edit changesCaolán McNamara
regression from cad9afa15f53d547733fa55f1353772f6d696611 Change-Id: I1aa36bf86969a5a90456817d360d59125948e519 (cherry picked from commit 32c26ffb1f7585318a11f684a9886b58cea5b307) Reviewed-on: https://gerrit.libreoffice.org/1218 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-12-21resolved fdo#57668 additional date formats using '/' separatorEike Rathke
Change-Id: Ib71fb25b8d5411b83f55649d9a18833470647eb3 Reviewed-on: https://gerrit.libreoffice.org/1196 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-12-21Fix lacking "/" on .icedoveJulien Nabet
It would prevent to find icedove addressbook if there's no link .thunderbird to .icedove I already did the same on master sources, see: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=ea5a96a5c771ee2c2ebbe4c12c4e7f3b1cba29a7 Change-Id: I24d1ff9b4af327a810997b97b0cf4112eba21e64
2012-12-21fdo#57611 do not crash when setting too small sizeLionel Elie Mamane
setWidth/setHeight's exception specifications are lacking, but fixing this in a stable release line is too invasive: they are "inherited" from the specification in offapi/com/sun/star/report/XReportComponent.idl and are thus part of our public API. Change-Id: I8ae2048a6c0acc6b6cf2beece9e630c87caac39f Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2012-12-21lo-commit-stat: allow to filer cherry-picked commitsPetr Mladek
Add --cherry option that filters commits using the "git cherry" command. Note that you need to pass git arguments for "git cherry". It means "old-branch-or-tag" "new-branch-or-tag". Change-Id: Iea67d0ead205c66112791cb0444fa183c7fa6e9b
2012-12-21lo-commit-stat: allow to generate more logs at oncePetr Mladek
It takes ages to get bug summary from bugzilla => it is worh to generate normal and wiki logs at the same time. Why not produce all logs with one call Add --commits option. Also rename --wikibugs to --bugs-wiki. Use .wiki suffix for wiki logs. Also rename "commit-log" to "commits". It is enough to use ".log" as the suffix. Change-Id: I92bbc4d56a0ae9e23401be0677256059c777d712
2012-12-21Make commit stat script recognize opensuse fate entries, tooThorsten Behrens
Change-Id: Ia6b3e6459c5bda7ea24091024cf3dabd19746237 Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-12-21Slightly more robust removal of bug title prefix.Thorsten Behrens
Change-Id: Ic37589222831d03ec48689a077b1eb16a9199385 Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-12-21fix bug 53508Maxime de Roucy
In the format paintbrush function : Apply the paragraph automatic attributes to all the nodes in the selection instead of just the last node. Change-Id: I655f00cbf44d3d80c19a7ef623bc1c7cb505ead9 Reviewed-on: https://gerrit.libreoffice.org/1180 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-12-21this method actually can throw, related fdo#57451Markus Mohrhard
Change-Id: I26b79829029e127eb8b9ab4fbea3e0f02035ee41 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-12-21we need to catch the exception here, fdo#57451Markus Mohrhard
Change-Id: I203aa640e7d4373f3a090a4988c28c6059b93064 Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2012-12-18class vs struct mismatchLuboš Luňák
Apparently this was enough to cause a linking error with oox::vml::TextBox::TextBox on Windows.
2012-12-17n#792778 DOCX import: parse group shapes in oox onlyMiklos Vajna
Previously textframes inside groupshapes were tried to be imported as TextFrames, but then their addition to a GroupShape failed, so the text simply ended up as a normal paragraph. Fix this by importing members of groupshapes as drawinglayer objects, just like how the WW8 import does. Also fix two testcases, which implicitely tested that the groupshape VML element is ignored on import. (cherry picked from commits 7fe05dc95d0c9a584e07483c04b13c071d55293f and d5c934d150cb6cea5f96cbbee4fb5e8312bf027e) Conflicts: oox/source/vml/vmlshape.cxx oox/source/vml/vmltextbox.cxx Change-Id: I1a9fba8a5fd532203a825e55b1d5996277ea12fa
2012-12-14Do extra check on source range to make sure no funny things happen.Kohei Yoshida
Like a crash in the pivot layout dialog... :-/ Change-Id: I9a330ee3f39ebacb7299d24868bb13ee2a9c3ec5
2012-12-14bnc#792048 - squash error accessing object ( for ole property )Noel Power
strange scenario where lhs property which is assigned to an object, in this case ( the property ) ADODB.Recordset.Source can assigned a String or ASODB.Command, however the Property will only return a string. This confuses the basic runtime. But... this happens in checkUnoStruct so really in this case the scenario is harmless, but.. we need to either squash the error ( or retain any previous error ) as appropriate Change-Id: I091877315a0c956b46fab8ff59feeb7e0572a169
2012-12-14fix sometimes data corruption with xlsx import ( with scenario sheets )Noel Power
formula import is buffered 'till the end of import. The processing of the formula data need to happen before the scenario import happens. This is necessary because sheet numbers stored in the formula addresses can become invalid as scenario import insertes new hidden sheets upsetting the previous table order Change-Id: I9357f028f31bec1b1504ca991f5534f80d79c9bc
2012-12-14fix fdo#58237 import hyperlinks for shapes in xlsx documentsNoel Power
Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f
2012-12-13bnc#791706: Support multiple selection in page fields.Kohei Yoshida
This change allows selecting multiple items in page field popups in pivot table. Conflicts: sc/source/ui/cctrl/checklistmenu.cxx sc/source/ui/inc/viewdata.hxx Change-Id: I692e13c0815211bac6da47fefd83bba18c901c5c
2012-12-13Revert "fix for bnc#791731 preserve cell formatting of datapilot area ("Kohei Yoshida
This reverts commit 3bc88c4fdc2a05f816f29cb42b7d4f609214357c. This needs a new solution.
2012-12-13vml import: only apply width-percent attribute if it's != 0Pierre-Eric Pelloux-Prayer
This fixes an issue with a shape defined with these attributes: mso-width-percent:0;mso-height-percent:0 and mso-width-relative:page;mso-height-relative:page; where all points were then located in (0,0) Change-Id: I51070ad2b2e4e05ab64f16813472ca1d7099fb09 Reviewed-on: https://gerrit.libreoffice.org/775 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2012-12-13fdo#52182: Fixed click in frames located in header/footerCédric Bosdonnat
Using a distance to click to select the best object to select between normal text and background object. (cherry picked from commit e8fbe97900f13305b17015d9044993bde4adab36) Conflicts: sw/source/ui/docvw/edtwin.cxx sw/source/ui/inc/edtwin.hxx Change-Id: Ib5b53161c7af2c16f4df379382f2e53fc6d8092b Signed-off-by: Michael Stahl <mstahl@redhat.com>
2012-12-13oox: v:textbox's inset attribute should be imported in Hmm, not in EmuMiklos Vajna
Trivial reproducer: http://people.freedesktop.org/~vmiklos/2012/simple-textbox.docx Change-Id: I030f7153326affc5a01e7ede1ddf1164fa500071 (cherry picked from commit 5bc835d48f1e5373b3a31bd166fadfdf19b3588f)
2012-12-13.dot files sometimes rejected by writer, bnc#793422Caolán McNamara
because CWW8 appears twice, once for normal .doc and once for .dot. So a .dot files is tested twice if it's supported by the WW8 filter. Depending on the (effectively arbitrary) order they appear in the list .dots may fail the "is a normal non template .doc" test after the "is a template .dot" test and get rejected as a CWW8 candidate. Change-Id: I88aec29fdd5f9ec4dd4ad2813ff3c6b8fa5c5461 Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
2012-12-13optional ppFlt argument never usedCaolán McNamara
Change-Id: Ib2c68091f14d04818ae5e7db0ad7b8a1ec151f4f Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
2012-12-13Simplify SwIoSystem::IsFileFilterCaolán McNamara
bRet = bRet && (pFltr->GetUserData().equals(rFmtName)); is already inside an if bRet = bRet && (pFltr->GetUserData().equals(rFmtName)); condition bRet = xStg.Is() && IsValidStgFilter( *xStg, *pFltr ); is already inside an if ( xStg.Is() ) condition Change-Id: I2115041d99b6fcbae7a829557c37627d03b5ee24 Signed-off-by: Tor Lillqvist <tlillqvist@suse.com>
2012-12-11use effect referencesRadek Doulik
Change-Id: Ie0d295cd7db695f777071edcd9b792056ac783ef
2012-12-11Import shadow effect properties for shapes in docx.Eilidh McAdam
Change-Id: I0cfd6b45be268d688b7389c79c5e9ad7f48eb12d Reviewed-on: https://gerrit.libreoffice.org/702 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2012-12-11Revert "for lnRef idx 0 is valid index into style matrix"Radek Doulik
This reverts commit 1c0af12bf1bc378e3e0c87be9840f41e89783f22. turned out that the standard is most probably missing explanation and that the valid zero index means no line stroke
2012-12-11HACK! use newer expand.exe, because system's expand.exe cannot expand our CABAndras Timar
Change-Id: I795db39b8b6286f75e79c73d44c11052c190c147
2012-12-11enable MSP creation and bump version number for 1st PTFAndras Timar
Change-Id: I18295f2c52f7cb4461e8efbd1f40121ac56e0c5e