summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-03Version 4.2.0.0.beta2, tag libreoffice-4.2.0.0.beta2libreoffice-4.2.0.0.beta2Christian Lohmaier3-0/+0
Change-Id: Id16283d2ae5b8290f7c1fec134b7fbdb9ed2c858
2013-12-03bump product version to 4.2.0.0.beta2Christian Lohmaier1-1/+1
Change-Id: Iae45fe7e8ca8865d7982dae96ae733eab65a7fc1
2013-12-03Updated coreChristian Lohmaier1-0/+0
Project: translations 198adcf1e6f8f7b776b137915fd0617846192a40
2013-12-03vcl: check if AT is running before loading the libraryMichael Stahl3-36/+33
... which should result in faster startup if it's disabled. Change-Id: I39774b0a56f186d08270c2f17b2b20a823f21dc2 (cherry picked from commit b44ed4c408d92f7a1a3f2390c056d518c137ddd0)
2013-12-03winaccessibility: remove global g_acc_managerMichael Stahl8-75/+33
It is possible to retrieve it via the AccTopWindowListener. Change-Id: I6cc5ab25bc937d0d9f4de54a1bed09a76ce27491 (cherry picked from commit fabca7370e22f96ae041dc179475b35c87ac53ec)
2013-12-03Revert "winaccessibility: let CoCreateInstance calls find the components"Michael Stahl2-12/+0
This only works partially: the ClassObjects are only registered on the main thread; CoCreateInstance on other threads still fails. This reverts commit 29c6216af8c502f220bb84857d3dda901ddfd234. (cherry picked from commit b54d441ad728ffce8e543de10bd897f0900422b5)
2013-12-03winaccessibility: fix my stupid mistake in createAggInstanceMichael Stahl1-16/+17
Change-Id: I7701021befcf1dbad85557c2095fe4bf0b4e0ff1 (cherry picked from commit d0e8e6e3cd51736583603e37f0ba2ff7bdf29f5c)
2013-12-03winaccessibility: replace CoCreateInstance with direct instantiationMichael Stahl11-33/+114
This is an alternative (to 732ec36edfd09d2091d70c4d71b5f182fe279c45) solution to the "CoCreateInstance does not work" problem: replace all CoCreateInstance calls with equivalent calls to create the components directly. Since the only reason why this COM stuff needs to be registered at all is that AccObject uses CoCreateInstance() to create its COM objects, another possible solution appears to be to simply link the libraries and instantiate the COM objects directly, without COM. The only difference appears to be that CoCreateInstance would automatically add proxy objects in case the COM objects reside in a single-threaded appartment; not sure if that is relevant here. Reviewed-on: https://gerrit.libreoffice.org/6792 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 3b86569fcba210eb6570fabef7ff8abf6aff91f0) Conflicts: winaccessibility/source/UAccCOM/AccHypertext.cxx winaccessibility/source/UAccCOM/AccTable.cxx winaccessibility/source/UAccCOM/EnumVariant.cxx winaccessibility/source/UAccCOM/MAccessible.cxx winaccessibility/source/service/AccObject.cxx Change-Id: I8ffb8af501f6084f3145fa4d4f53366a070e1691
2013-12-03vcl: fix crashes when retrieving objects for MSAAMichael Stahl1-4/+6
The ImplHandleGetObject() function modifies the Application Settings and must take the SolarMutex for this; otherwise we get crashes when another thread calls StyleSettings::GetPersonaHeader() during some unoapi test. Also fix another HWND to long cast; use LRESULT which is Win32 for intptr_t. Change-Id: I5580f88ed0a8e9955697655ace94584e2307982d (cherry picked from commit db214684057e3ff2fa32d57c00507309dd6c24d6)
2013-12-03Blind fix for sal_Int32/int confusionTor Lillqvist1-1/+1
Change-Id: Ia052922ec323220b8785b1a156e5bc2fbf44c11b (cherry picked from commit 40e98f439f892af47b508968aaa25c2327b97868) Signed-off-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03fdo#70797 fix incorrect argument handling of CHISQ.DISTWinfried Donkers4-3/+28
Change-Id: I6187aa673034e6dc18f48f7b6b7ac88989ab55ec Reviewed-on: https://gerrit.libreoffice.org/6914 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit c3760e9099db9cf1be696347e2a0743a3cae1b20)
2013-12-03Revert "sw: valgrind complains about uninitialized mbIsPrepareSelAll"Michael Stahl1-1/+0
Oops, that one is master-only. This reverts commit eeca244139eec880f0eb0141243de98c3d85be9a. Change-Id: Ibb65fb17304cbd405096afbbdde7fff11a91c4f6
2013-12-03SwAccessibleFrameBase::Modify(): avoid accessing deleted mpFrmMichael Stahl1-0/+2
In ~SwDoc when a SwFmt is deleted, SwAccessibleNoTextFrame::GetNoTxtNode() would access the mpFrm which at that point was already deleted too; avoid that by returning early. This can be reproduced by closing the bugdoc from fdo#71450. Change-Id: Ide4d42511ccad116fa0362c23ced299d8430d08a (cherry picked from commit 4c9ddd594e26c517b8515f77206bfeb2fb063e03)
2013-12-03sw: valgrind complains about uninitialized mbIsPrepareSelAllMichael Stahl1-0/+1
Change-Id: I5405a6818fc63c3e29bb189858fd0abc73f67e43 (cherry picked from commit c6f3d909f8e5c64b6bc36a13dfd0d46eb0e1d88d)
2013-12-03fdo#71434: don't show master text if PlaceHolder types definedKorrawit Pruegsanusak1-3/+20
I've added all of valid PlaceHolder types from http://www.schemacentral.com/sc/ooxml/t-p_ST_PlaceholderType.html (cherry picked from commit bb1213a740b3b3b2b1967639939dd7a72c6d4237) Change-Id: I038fe43ff83699f92ff5eb9945bce12540058478 Reviewed-on: https://gerrit.libreoffice.org/6822 Reviewed-by: Muthu Subramanian K <muthusuba@gmail.com> Tested-by: Muthu Subramanian K <muthusuba@gmail.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Revert "fdo#67862: Add greek symbols to docking window"Thomas Arnhold4-219/+1
This partially reverts commit e9a7ff1a5ba9d5ba34eeca9d622d8a3a9c68ade8. Leave the SAL_N_ELEMENTS changes in. I forgot about the translation of those symbol names. The en-US %alpha is %alfa in pt-br. See starmath/source/symbol.src. One list get's translated, the other not. For UI purpose GetUiSymbolName gives the tranlated one and for export GetExportSymbolName gives the untranslated english string. Feel free to implement this or maybe drop the translation of those symbols. Conflicts: starmath/inc/starmath.hrc Change-Id: I74d667a727536e1caf35f32af6a5c9cc64ca7015 Reviewed-on: https://gerrit.libreoffice.org/6885 Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Test trendline properties using an emport -> ixport cycleTomaž Vajngerl2-0/+161
Added a test which checks the preservation of properties for trendlines / regression curves in an export -> import cycle using different file formats - ODS, XLS and XLSX. Change-Id: I59fe6c045f7f503ee074e6a2741fa017756b3018 Reviewed-on: https://gerrit.libreoffice.org/6877 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Support regression curve name in old binary XLS XP/2k/2k3 format.Tomaž Vajngerl5-2/+30
Change-Id: Ie6f2fd3cce70e4789805e788846d3beb64620a4b Reviewed-on: https://gerrit.libreoffice.org/6876 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Support regression curve name in OOXML (import & export).Tomaž Vajngerl4-12/+21
Change-Id: I847e0df4f160e4b5078961a0e77c1e1e3fff9bd4 Reviewed-on: https://gerrit.libreoffice.org/6875 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Support regression curve name in ODF.Tomaž Vajngerl3-0/+3
Change-Id: Ic065d63eee507906febfa15eb6d5ae1e7de58280 Reviewed-on: https://gerrit.libreoffice.org/6874 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Custom name for a trend line (shown in legend).Tomaž Vajngerl9-31/+127
Previously, a trendline name was fixed to a combination of the trendline type and the name of the series. With this it is possible to add a custom name for the trendline, which is shown in the legend. Change-Id: I61eaaf14e6df45088abdf1f3e9c24877d26ae8a7 Reviewed-on: https://gerrit.libreoffice.org/6873 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03Simplify conversion from/to ItemSet/PropertySet for RegressionCurvesTomaž Vajngerl3-355/+139
Change-Id: I5ddf53f984508a88fd02063eb9f81cd05cf627c9 Reviewed-on: https://gerrit.libreoffice.org/6872 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-03DRY-cleanup RegressionCurveItemConverterTomaž Vajngerl1-144/+117
Change-Id: I8fb799b2efc81587252161ccadfa1dbd6b096bda Reviewed-on: https://gerrit.libreoffice.org/6871 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
2013-12-02fdo#72163 belts and suspendersLionel Elie Mamane1-2/+4
1) Do not dispose m_xComposer, might still be used by our m_pCache 2) Do not create a new m_xComposer if the previous one will do, so that we do not gratiously use a different one than our m_pCache. Change-Id: I6540c035c9159017c694b36e676721ec3e42db51
2013-12-02fdo#72163 after updating m_xComposer, command facets are not dirty anymoreLionel Elie Mamane1-0/+2
Else we dispose m_xComposer too eagerly; still used by m_pCacheSet. Change-Id: I205488465c19a356534df17b8a5e9a20ce6766c9
2013-12-02fdo#71450 fdo#71698: ODF import: fix frame name corner casesMichael Stahl1-2/+10
Trying to set a name that is already in use will throw an exception (and set a different, generated name); if there is actually no name in the file then there's no point trying to set anything. (regression from b69d152cfa1da868ba960345d72ba78f9f8e1b35) Change-Id: Ie54d4a830cc23e2853a6efeb81f77dcc788192ea (cherry picked from commit 8171e713e74e3d09e86592c28abfe05d0400c071)
2013-12-02fdo#71749: sw: WW8: don't loop on tables in footnotesMichael Stahl1-1/+1
(regression from ee1db992b98378b5e2f5e9aa8af0e36c375e582f) Change-Id: Id10b6fb8e9e3697b10a1df605cb48d94a55ad207 (cherry picked from commit 790896d9a557d34ea91d6e5926471de66503be7a)
2013-12-02in .xlsx import append a parameter for CEILING, FLOOR and WEEKNUM againEike Rathke1-17/+39
7a3b8b1a5a753627c6518b9a5b8e2a041d4d6331 switched formula parsing from API FormulaParser::importFormula() / ApiParserWrapper::parseFormula() to ScCompiler, which means that also FormulaFinalizer::finalizeTokenArray() is not executed anymore and processTokens() and processParameters() that among others handled appending Calc-only and required parameters. At least implement that parameter part at ScCompiler now. Change-Id: Iaa2804c82ec43dd51f781485b0e2afab8c613638 (cherry picked from commit 0f8eef96d28245b4905ff9f1cfb18bc540f0f7b5)
2013-12-02added isOOXML()Eike Rathke2-0/+10
Change-Id: I9e088e1d6679297884d71604b03537b73ee3387c (cherry picked from commit 5a5b35c979acf303d99a365b6735148d4f0ab817)
2013-12-02GPU Calc: cache the very last compiled program in memorylibreoffice-4-2-milestone-3I-Jui (Ray) Sung1-21/+36
Change-Id: Ib805c31f0c1b57708c38c02a9bdc492af5c7a439
2013-12-02store internal CONVERT to .xlsx/.xls and distinguish from CONVERT_ADDEike Rathke3-3/+19
Change-Id: Ie9b5f6ade1c25618aa990ce17bd7b2a2b46a250a (cherry picked from commit 8302495a219e869f194f4b585c6f2b996eee0a5c)
2013-12-02Resolves: #i123765# reset buffered DropTarget when undockingArmin Le Grand1-0/+5
(cherry picked from commit 8d679227fafe9108c4dc6e8adff85a727e4ef3af) Change-Id: Ia6fba705d91157afea30693fa7078aabc96f02ac (cherry picked from commit 032a4f6b2d771dd4e1b4a1ceee7c3ef15ca356eb)
2013-12-02Resolves: #i74854# fix buttons in MsgBox with info iconHerbert Dürr3-1/+11
Patch by: hanya.runo@gmail.com Found by: ooo@catcons.co.uk Tested by: hdu@apache.org (cherry picked from commit 02cc651a1b45cbfbdab0aca6b57bff7bdf9e4f2c) Conflicts: basic/source/runtime/methods.cxx vcl/inc/vcl/msgbox.hxx Change-Id: I1656263e189f1a6cfa58436741bfa74ae0e6fffa (cherry picked from commit 3a437baee23d45ab64d557fed75e2e1b14aa5541)
2013-12-02release SolarMutex after successful tryToAcquire()Eike Rathke1-1/+5
tryToAcquire() locks if successful, so unlock when leaving Change-Id: Ic0bd4b10ccb8419dd40946dbaf393a27e413bf2d (cherry picked from commit e56105a1f24e9eac491c32c841030c69fb2e2d30)
2013-12-02sc: no such thing as std::vector::findMichael Stahl1-1/+5
Change-Id: I11bb688a8e0affda9ed78a61d9aba3d244914f8c
2013-12-02sc: threaded parsing of the core data inside large XLSX filesMichael Meeks6-154/+285
Enabled in experimental mode only or via SC_IMPORT_THREADS=<N> this allows significant parallelisation of sheet reading. I also implement a simple thread pool to manage that. Conflicts: sc/source/filter/oox/workbookfragment.cxx Change-Id: I66c72211f2699490230e993a374c26b1892eac12
2013-12-02Allow worker threads to use their own FastParser instances.Kohei Yoshida5-94/+292
To prevent deadlock during threaded sheet stream parsing. It now deadlocks at a different place. Conflicts: oox/source/core/xmlfilterbase.cxx sc/source/filter/oox/workbookfragment.cxx Change-Id: I0ba0f2c9a257e71b0a340ab14e369b06d5fd8829
2013-12-02added Kurdish, Southern (Iran) [sdh-IR] to language list, fdo#63460Eike Rathke4-0/+5
Change-Id: I575c8a51cff1cf451c776818711d2e0fd458a322 (cherry picked from commit fefacbd92f4e3355ecd04841b8eacc75a4a67223)
2013-12-02fdo#71056 add <sup> to list of inline help XML tagsAndras Timar1-2/+2
Change-Id: If0937bd571658e0f76a51e44dd3fa008f701f02e
2013-12-02Resolves: fdo#71527 make presenter console not crash/uselessThorsten Behrens8-21/+22
Basically reverts the pieces of 21ec9beae29b19b8ec6f0a16fd0e708e4f210208 to make XSpriteCanvas a XBitmapCanvas again Otherwise PresenterHelper::loadBitmap is not an XBitmapCanvas and so VclFactory::createBitmap cannot succeed (cherry picked from commit 639aa8e72639fd01e9004977f1cfaafc13b1e45f) Revert "Resolves: fdo#71527 make presenter console not crash/useless" This reverts commit 639aa8e72639fd01e9004977f1cfaafc13b1e45f. (cherry picked from commit 72aa51185fb7b1ff2ad9006f2067a680b70ab66d) Revert "Resolves: fdo#71527 don't crash in presenter console" This reverts commit bae01385c895a100b5371879889e606927cff877. (cherry picked from commit b807b2d9291a2328a55de55d67c4874803d8b7fd) Fix fdo#71527 no unguarded ptr dereference here. This is the real problem - mxPane can be validly NULL. (cherry picked from commit 1b10205c2cb952ab43e30706c05f78d6e8f642c3) Further XCanvas != XBitmapCanvas cleanup. It seems I missed a few places in 21ec9beae29b19b8ec6f0a16fd0e708e4f210208, getting that straight now hopefully. (cherry picked from commit 05d2994c136650deca2d80fedf6b14d10109986e) 0ac1a7ada530791e2d34d2f0802213c869ea48a1 d149bae0904fd6c2120209d69490d0b257ac3f64 e8d055db9bfb68cb9031fa970518343f5aec6619 34fc8df2d1ee65bef0639b3de9487ff311bed89a Change-Id: I197adf98e915102f383ee050a8ea16d1e41cecf2
2013-12-02fdo#71748 Fix color pickersMaxim Monastirsky6-29/+5
This commit includes the following changes: 1) Remove boxes from PNG files, and draw them ourselves. This will ensure that the color rec will always fit the box. Also it will make all color pickers look the same, and greatly simplify the code. (a part of the code was not reachable anyway.) 2) Fix color preview for toolbar large icons. (a regression of commit f59c47fc1e79050d3342924e6173b0f4b6ddaf02.) 3) Fix sidebar paragraph color picker initial drawing. reset should be called *after* the icon assignment. Change-Id: I13ae02bc3dd68dd14877ccc949784072c58bf211 Reviewed-on: https://gerrit.libreoffice.org/6882 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e239f372c6abcd8371d0a666c828bf1c31195dd4)
2013-12-02fdo#43494 Allow UI scaling up to 400%Samuel Mehrbrodt1-1/+1
Change-Id: Ibf53276b567b0591f9635f49761784900faae816 Reviewed-on: https://gerrit.libreoffice.org/6891 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 62e2cfa79cef65a82c21f3d2bcca890d85beae95)
2013-12-02fdo#43637 Two commands with the same name "Backspace"Samuel Mehrbrodt1-1/+1
One of them emulates the "Backspace" and the other one "Shift+Backspace", so I renamed it accordingly Change-Id: I8a2a9f2b5b7212d4ea385c3b5f2e47ac014accc3 Reviewed-on: https://gerrit.libreoffice.org/6887 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0d4e04b8378ca3e142c8b2f2c50851b3c74df012)
2013-12-02Updated coreAndras Timar1-0/+0
Project: help c39ebf24983ffc3c2bfc52a61ddebf7512b68e10
2013-12-02make data streams an experimental featureMatúš Kukan3-5/+16
Change-Id: I674b86a6e1c1c0b162c159747b6900ce438ab095
2013-12-02fix memory leakMatúš Kukan1-0/+1
Change-Id: Ic84ace8ac3aa52009f43aafe78283730f97881f2
2013-12-02datastreams: No need to disable undo. We do not add undo actions.Matúš Kukan2-4/+0
Also fixes memory leak, because EnableUndo() was called from Document's destructor. Change-Id: I637ff62bde6f8c3238238323e6e4a5a5d2b81881
2013-12-02datastreams: Simplify code for importing CSV data.Matúš Kukan2-13/+77
The code is copied and simplified from sc/source/ui/docshell/impex.cxx. Change-Id: I15a426a16c4f2ba659af86492c1b2e4ba879d8b6
2013-12-02datastreams: for security, ask before executing a script when importingMatúš Kukan3-9/+57
Change-Id: I76a11dae2569eb7e0c791c9f1fb20626c4ff7528
2013-12-02Let's use ScRefreshTimer for data streams instead of our own thread.Matúš Kukan4-53/+26
As was the original idea, for some reason abandoned, and as ScAreaLink does. The main advantage is that ImportData() is not called anymore with invalid mpScDocument (when we close it). There is surely something going on with SolarMutex and it just works better. We do not need to use our own SolarMutexGuard. Change-Id: I09256a18ffa14606fc8e06b968016bbc0562a6fa