AgeCommit message (Collapse)AuthorFilesLines
2013-10-01Version, tag libreoffice- Lohmaier3-0/+0
Change-Id: Ieec4ca0e61bb30062903687829d06e4d0047bc42
2013-10-01bump product version to, release number to 1Christian Lohmaier2-25/+25
Change-Id: Id11e0708cc30c43c158a0362e62d06ec1c25241a
2013-10-01Branch libreoffice-4-0-6Christian Lohmaier3-0/+0
This is 'libreoffice-4-0-6' - the stable branch for the 4.0.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I45aa3d2d72a1d7cd75df6b9007469da7642c5b0f
2013-10-01bring helpcontent2 to libreoffice-4-0 branchChristian Lohmaier1-0/+0
Change-Id: I0aaa58ba4ac11d56a2ea8203bf16c3f4c782d2dc
2013-10-01Updated coreChristian Lohmaier1-0/+0
Project: translations 06359830b9ee9f304f01ccd9e2fe063c6d256b08
2013-10-01All the content of cppuhelper/source/compat.cxx must be in namespace cppuStephan Bergmann1-0/+4
(cherry picked from commit 69f1846f4095a9dc607a0e568980d8625d657c94) Conflicts: cppuhelper/source/compat.cxx Change-Id: I30dde10d1c299dbd9c0b2cb2fa025ce432df6cce Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-09-30fdo#69450 - IDF_ATTRIB & IDF_CONTENTS must be disjoint.Michael Meeks1-1/+1
Change-Id: Ib971824a7f274334012b872acec65310535ad767 Signed-off-by: Markus Mohrhard <>
2013-09-23fdo#54686 Treat hard blank as soft blank in numberLaurent Balland-Poirier2-10/+11
AutoCorrect option "Add non-breaking space in French..." insert non-breaking space (hard blank) and avoid recognition of percent number and time number. This patch treats hard blanks as soft blank in number format recognition Rev.#1: change #define to const variable. Same change in svxaccor Rev.#2: improvements Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <> (cherry picked from commit 2f4d7eacabd62db35777682bcca353e142e024bf) Conflicts: editeng/source/misc/svxacorr.cxx svl/source/numbers/zforfind.cxx (cherry picked from commit 1ca4b1bae11704a1119a9c680c6ae5b85ea1b31e) Signed-off-by: Eike Rathke <> Conflicts: editeng/source/misc/svxacorr.cxx Change-Id: I30c2c36778cb53a0238a0829043dad4d709f97d2
2013-09-19Resolves: fdo#69220 crash in doc (ww6)Caolán McNamara1-1/+15
Change-Id: I5a09d121a0b0342f28ba5d2d39027b27e9c9eba2 (cherry picked from commit 2e93541d00f9d4aaa6ad2aeb35ee0c901d216cc0) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-09-19Resolves: fdo#67697 source formatting option list in autocorrectCaolán McNamara2-4/+19
regression from 0513e10635c85fc1aa214948de4992d4b76d555c "fdo#49350 Speedup "OK" action of auto-correct dialog" (cherry picked from commit 95e566b9a0df06d130e118181058273f034bcf2c) Conflicts: cui/source/tabpages/autocdlg.cxx Change-Id: Iede6063729433beb3ac50dbdb45230c1d774cea0 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-09-19Resolves: fdo#34987 skip autoheight reset if it will be set to the same valueCaolán McNamara1-2/+43
Triggered by aa9af08b389a106fcfb53842ac7669b208a27205 which explicitly sets rSet.Put( SdrTextAutoGrowHeightItem(FALSE) ); so there is something set on the style which is being overwritten. The code here resets the style to the default of "true" before going on to set it to the explicit "false" again. In that window of time the master shapes listen to the property change, on being set to autoheight they resize and on being unset, they remain stuck on their autoheight calculated size. Reviewed-on: Reviewed-by: mhofmann <> Reviewed-by: Thorsten Behrens <> Tested-by: Thorsten Behrens <> (cherry picked from commit 14e7a290dab7fead66ef6ff7f94c6a425d80ceb6) Conflicts: xmloff/source/draw/ximpstyl.cxx Change-Id: I567a791b2bbbcb3a1a111633fabf509142984645 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> (cherry picked from commit 0964a73d03bf9f5b9f485ff39f97c7e7b54339b3) Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-09-19fdo#41833: fix visual cursor position after resizingIvan Timofeev1-1/+1
SetOutputArea updates a cursor position, SetVisArea doesn't => call SetOutputArea after SetVisArea. Change-Id: Ie8f079cb3d567f759c84587a8072b98fab43588b (cherry picked from commit ddbcb6687722314b37cfda3170596ac7a4f69602) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-18fdo#40100 make function YEARFRAC comply with ODF Version 1.2Lionel Elie Mamane1-20/+52
example of wrong result: =YEARFRAC(DATE(2023;1;1);DATE(2024;1;1);1) Pretty much by definition, this should be exactly 1, but it currently returns slightly less. Change-Id: I5ebb2ecde49dfca8a6191d2a7c11b9581669f455 Reviewed-on: Reviewed-by: Eike Rathke <> Tested-by: Eike Rathke <>
2013-09-17fdo#64455 Handle unknown color in color lineLaurent Balland-Poirier1-1/+37
Change-Id: Ice4205056cc64ae50bd3c8136aeae6f648adbd0b Signed-off-by: Ivan Timofeev <>
2013-09-17fdo#68874: Highlighter icon doesn't change color if no text is selectedIvan Timofeev1-1/+1
the problem is that bChoiceFromPalette becomes false too early when StateChanged is called with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND_EXT (we don't handle it in the switch) and the following call with nSID=SID_ATTR_CHAR_COLOR_BACKGROUND (which we actually want to handle) is no-op. Change-Id: I024f6a443535411648bda44576e838c3d863e7de (cherry picked from commit 1d0e18703523139e5fd6d11b6f3d72bb0b368036) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-16fdo#69091: Copying data from Base-table to Calc by drag and dropJulien Nabet1-1/+1
Depending on whether the data source is registered, either rDescriptor[svx::daDataSource] or rDescriptor[svx::daDatabaseLocation] will be filled in (and should be used). Luckily, ODataAccessDescriptor provides a utility function that will automatically return the one that is set. Use that instead of hardcoding svx::daDataSource. Thank you Lionel! Change-Id: I02673e7924c4323915dea579015326194c3f5077 Reviewed-on: Tested-by: Lionel Elie Mamane <> Reviewed-by: Lionel Elie Mamane <>
2013-09-15fix for fdo#69173 crasherNoel Power1-0/+3
the layout changes for the basic IDE ( for the object browser and object catalog ) seem flacky, I have seen since those changes have been introduced some strange ( but random ) behaviour ( like the odd unrepeatable core ( maybe related to this ) and also sometimes Modules appearing in the tree under the wrong nodes etc. I'm no expert in the basic IDE code but this patch seems to fix the problem. However there is one drawback, in the core inducing scenario the tree view ( object catalog ) dissappears, this is because the patch suppresses the problematic layout in this case ( as the layout seem not to be currently able to deal with 'no-existent' (recently) deleted current window ) Probably in this scenario a fallback currentwin (instead of nil) could be set this would behave better but ideally. Ultimately the layout class should probably be modified ( possibly redesigned ) Change-Id: I9d1e23bd6fc4aae32aa78da8278c318f7051136a
2013-09-11CID#736212 clip word 2 pap boundsCaolán McNamara6-1/+13
and add a unit test for the word 2..5 formats (cherry picked from commit 5d8a9d56de7c1217cfdbe2288c1a3a9128c3dbb5) Conflicts: sw/qa/core/filters-test.cxx Change-Id: I6c7c26be6092acbb81282080de6c393d92ad5dd4 Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-09-09Work around GCC 4.8 -Werror=format= in python3Stephan Bergmann2-0/+16
...complainging that "‘PyArg_ParseTuple’ is an unrecognized format function type." Change-Id: I125af6669010c4c9c1a18cc7c1a4895acc89338b (cherry picked from commit c6cfd44717643b0630b5f8fd3262c243fdaaf239)
2013-09-06fdo#68313 fix combining diacritics problem with Graphite fontsLászló Németh2-3/+3
Change-Id: I042a32cc9c025efcd25ccf95427bee5d6d4024fb
2013-09-06Resolves: fdo#68081 why would I want a spinner that doesn't repeatCaolán McNamara1-1/+1
surely WB_SPIN should imply repeat in the first place, *shrug* Change-Id: I1e4cb5a01d473cd0f8d907d566cd26d51a81da93 (cherry picked from commit f96771165ea145a759f1bab76cd34bb70def04f6) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-09-05Consistently use rtl_getAppCommandArg hereStephan Bergmann1-1/+1
...2a9c1d1a75b7d4e79dfbc6be3dada1a1e959e58e "Make dialogs fail with an exception in headless tests" missed one of the osl_getCommandArg calls, which can lead to problems when there are any -env: arguments preceeding the --display argument. Reported by renduly on IRC. Change-Id: I98dd24be840d561dce51034088f3e44adff9f2ff (cherry picked from commit 379a53017447fbf2a459f82ae8905b6683e80e8d) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-03fdo#68839: ODF import: fix name of multi-image frameMichael Stahl4-7/+34
When multiple image child elements are inside a frame, each one is imported and gets unique name via SwDoc::SetFlyName(). But the retained one is not necessarily the first one, which is the only one that may have the original name. Also the solveMultipleImages needs to return a smart pointer, as nothing else keeps the image contexts alive. (regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70) (cherry picked from commit b69d152cfa1da868ba960345d72ba78f9f8e1b35) Conflicts: xmloff/source/core/xmlmultiimagehelper.cxx xmloff/source/draw/ximpshap.cxx xmloff/source/text/XMLTextFrameContext.cxx Change-Id: I28a8a752f3eed176cc2ebb4c9af11a0dd4d18ea6 Reviewed-on: Reviewed-by: Miklos Vajna <> Tested-by: Miklos Vajna <>
2013-09-03Resolves: rhbz#993963 NULL m_pWindow on firefox deleted pluginCaolán McNamara1-1/+1
(cherry picked from commit 4a4ed52e57b540167c3ca45e6e762b9e21e874de) Conflicts: vcl/unx/gtk/window/gtksalframe.cxx Change-Id: Idb12b12e4313668bf3390a97551c688ee0dcde67 Reviewed-on: Reviewed-by: Michael Stahl <> Tested-by: Michael Stahl <>
2013-09-03odbc insert: adjust buffer size *after* it is written toLionel Elie Mamane1-1/+1
the buffer (aBookmark) is written to by SQLBulkOperations or SQLSetPos, not by SQLBindCol, which merely sets up the instruction that the next call should write there. So its finak size is known only *after* the call that makes the write, obviously. Change-Id: I4faaaeffc060433645188f0eda3d9958b087cf6c Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-03fdo#68315 odbc update *reads* a bookmark, not *writes* a bookmarkLionel Elie Mamane1-21/+39
This code was completely inverted. The row update operation *reads* a bookmark (that is, what row to update), not *writes* a bookmark. So we were passing an empty bookmark, and thus the update was failing because we were refering to a non-existent row. Change-Id: I676b1a7727a88e13a3e465bd96cbbaf18dad2fa6 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-03stop annoying temp full screen windows appearing on insert->index entryCaolán McNamara1-0/+8
Change-Id: I730617f5ce28149f79d1d22efbfb7eab22e5840d (cherry picked from commit 8f6b90a80c7b6e1c19422e944ca49657581e1042) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-09-03bDel is unused uninitializedCaolán McNamara1-0/+1
Change-Id: Idac3a6805700d896b8569d1df79d32ca493c48b3 (cherry picked from commit 91a557561c24c7532c525692f279b1fcfd520f92) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-09-02Updated coreAndras Timar1-0/+0
Project: translations 83cf8a270e2e6b2dabecb9eee97faa879542787c
2013-09-01Revert "fdo#42434: swap flipvertical and fliphorizontal icons in some themes"Ivan Timofeev20-0/+0
This reverts commit 178d86a99820c5e0b9ca668c49300d468ab70e10. Turns out it's not needed in this branch. The bug version is 3.4.3, so I thought that all versions 3-4..4-2 are broken. Surprisingly 4-0 was already fixed, and 4-1 is broken again... Change-Id: I48bc00d72e360073db3c4e1cd9d14dd5fcb5ebf6 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-01fdo#42434: swap flipvertical and fliphorizontal icons in some themesIvan Timofeev20-0/+0
(cherry picked from commit 07aefbe310cad43bf9a71ba073486cddd7e062f2) Conflicts: icon-themes/tango_testing/cmd/lc_fliphorizontal.png icon-themes/tango_testing/cmd/lc_fliphorizontal.svg icon-themes/tango_testing/cmd/lc_flipvertical.png Change-Id: I037b55811bf7f14a7aadcb85ae700516022896ce Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-01fdo#67358: sw: "fix" line painting artifacts when resizing columnsMichael Stahl1-1/+3
SwEditWin::MouseButtonDown(): for unknown reasons invalidating the window here causes the column resizing lines to not be removed after the resize is done, so disable it. (regression from 289185fd02d6d9734b6dbde01f15c4e6c5beacbb) Change-Id: If3ba0a72c53c5c2734fb905ae35d62f6a3e8938b (cherry picked from commit a2c67975c03010b90c706523293f180c1f29e229) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-09-01fdo#66215: sw: fix clicking on text above background flyMichael Stahl2-4/+43
SwPageFrm::GetCrsrOfst() tries to compare the distance to the closest text vs. fly but does not do it right because GetCharRect() returns just a line of width 1 on the left edge of the character; try to figure out the entire area covered by the character via 2 calls to GetCrsrOfst(), which gives much better clickability. (regression from e8fbe97900f13305b17015d9044993bde4adab36) Change-Id: I825e86daf65692dfb962ad576772c5f543d02d19 (cherry picked from commit edd2db1c783bd571ff796a5298385cacc91877b9) Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
2013-08-30TPropertyValueLessFunctor must actually compare for "<"Stephan Bergmann1-1/+1
Change-Id: I584a410d90531a0f7b784e62f94c39e715713cf1 (cherry picked from commit 2410b3c3ddc6fea02dadd56b39bb1181312c383a) Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-08-29make the tinderbox information more reliable in the about dialog (fdo#58034)Petr Mladek6-8/+22
Pass the information via config/config_buildid.h. Then cui/source/dialogs/about.cxx will get rebuilt also in the incremental build. Also allow to set EXTRA_BUILDID also via environment variable. This is much easier with tinderboxed that work with static autogen.input. Change-Id: Ic0b0d13f031c988c096bfd4533e650e245a0ad74 Reviewed-on: Reviewed-by: Luboš Luňák <> Tested-by: Luboš Luňák <>
2013-08-29fdo#63273 sw: let word count not update stat. fieldsMiklos Vajna4-15/+21
Updating fields would generate loads of selection change events and it's not what we asked for. Regression from ce14342c4292628a641a72d4f63d9c048e030c6a. (cherry picked from commit e2484e3998f2c5036fb8e3584d4b1c72db19bfd3) Change-Id: If237df1f31436357022ca8d77b924681e403abd8 Reviewed-on: Reviewed-by: Björn Michaelsen <> Tested-by: Björn Michaelsen <> (cherry picked from commit 699b7626222ea8be1c9713a7f5e274dbfbc029ff) This also fixes fdo#67223. Signed-off-by: Michael Stahl <> Conflicts: sw/inc/doc.hxx sw/source/core/doc/doc.cxx
2013-08-29Resolves: fdo#68192 always recode from trad symbol to apple symbolCaolán McNamara1-10/+11
Even if the symbol font bit isn't set, the oox import route lacks the ability to state that the bullet font is a font of symbol encoding. If the font is not available on the system we go into fallback logic to state that famous symbol fonts are in symbol encoding. But there is a symbol font on mac so its not unknown and that doesn't happen. And the mac symbol font is not actually in symbol encoding (seeing as it's all rearranged into the correct unicode positions) so the recode logic is skipped in this special case to map the microsoft/adobe private use area chars to the modern code points where they were moved in the apple font. I guess one alternative possible solution is to lookup all the fonts used in a openxml doc using the fonttable stream where the charset info is available. But seeing as it should only affect one particular font lets just move the encoder test outside the issymbol block. (cherry picked from commit b129867306ce918f4f8fbf9ec5f7dce86e52c9d2) Conflicts: vcl/source/gdi/outdev3.cxx Change-Id: Ic5bd3ec15c8d8d99e2cab0fb67cc4bc33081c756 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-08-28Uploading libvisio 0.0.31, fixing fdo#68477Fridrich Štrba4-33/+2
Base64 decoding in some boost versions throws on padding characters (cherry picked from commit 710eb05b0fe7a4396dcec169d15c337d1664e9d4) Conflicts: download.lst libvisio/ Change-Id: I9a9a43c2a7e55b6a6fca085302eae223bc8c1b13 Reviewed-on: Reviewed-by: David Tardon <> Tested-by: David Tardon <>
2013-08-26fdo#39484 - don't loose outlines while trying to undo formulae changes.Michael Meeks3-6/+8
Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <> Conflicts: sc/source/core/data/table2.cxx Change-Id: Ib3b2bab5beffb8164a8cd2c0b4db4c97f427507e
2013-08-26rhbz#1000150: Do not call exit upon XIOErrorStephan Bergmann2-21/+16 done in _XIOError (libX11-1.6.0/src/XlibInt.c) after calling the XIOError handler function (either the one supplied with XSetIOErrorHandler or _XDefaultIOError), as that calls the atexit handlers, which can wreak havoc in unrelated threads that happen to be running in parallel, leading to arbitrary crashes. So avoid that by always calling _exit already from our XIOError handler. The old code was careful to /not/ call _exit when the XIOError happened on any thread but the main one, but I do not see the sense of that---after all, _XIOError will inevitably call exit afterwards, so this cannot be a way to "ignore" XIOErrors from special threads (that are set up say for the sole purpose of trying out "known-shaky" activities without affecting the stability of the whole process). And findings like comment 12 to <> "[abrt] libreoffice-core- ICEConnectionWorker thread still running during exit" ("it is very likely that this is not a normal exit from reaching the end of main, but rather some explicit call to exit from some error handling code") make it clear that we apparenly do suffer from such calls to _XIOError -> exit on non-main threads. I have no idea why vcl/unx/gtk has its own XIOErrorHdl that is substantially different from the vcl/unx/generic one, though. cherry picked from commit ffea65915b9cc6d4f3c01f829552702654a040f9, plus follow-up b240a1c188b58e3e717335339bfc3f5e20bb2bf4: rhbz#1000150: Do not call exit upon XIOError, take two The _XDefaultIOError handler (libX11-1.6.0/src/XlibInt.c) already calls exit (even though _XIOError calling _XDefaultIOError would call exit afterwards, too), so our XIOError handler must not call aOrigXIOErrorHandler. Change-Id: Ida7d407cf5f0fa4e719118cab5e725144ceb3a35 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-08-26Updated coreAndras Timar1-0/+0
Project: translations 0bdd23ed769be53974c9f545b70fe9de1d1bec7d
2013-08-24fdo#68440 update Italian autocorrectionAndras Timar1-0/+31
Change-Id: I7f0dcccc5abf3ba0d0969973c4d0800095bfcca7 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>
2013-08-23use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XXIvan Timofeev4-4/+4
Michael Meeks pointed out that the latter can cause problems. Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93 (cherry picked from commit 9dd52eb86a9122e34c307a9160ae3ccd5706c94e)
2013-08-23WaE: g_type_init has been deprecated since GLib 2.36Ivan Timofeev4-2/+8
Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829 Reviewed-on: Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <> (cherry picked from commit 025857d81d4781a95cda4e790808b05b97eb97d9)
2013-08-23-Werror=unused-local-typedefs (GCC 4.8)Stephan Bergmann2-3/+0
(cherry picked from commit 52c5eb20fd96d63e17cb9cd18912030131bcc787) Conflicts: sd/source/ui/toolpanel/controls/MasterPageObserver.cxx Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db
2013-08-23-Werror,-WuninitializedStephan Bergmann1-1/+1
Change-Id: I885851dd3121e34a3f860a449d4d23d185a4d278 (cherry picked from commit 150a965248da361440b5cc195c810751ab11e92e)
2013-08-23Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxxStephan Bergmann9-37/+48
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab (cherry picked from commit 3912e47044f753f82c63ac11e803be5fb756c14f)
2013-08-23-Werror=unused-local-typedefs (GCC 4.8)Stephan Bergmann1-0/+202
Change-Id: I873813e30e44712d6793bad91938eb847b55a7bb (cherry picked from commit 72c62e0e83598862e1c6e00e4264d7720aa94e41)
2013-08-23Work around GCC 4.8 -Werror=unused-local-typedefs in boostStephan Bergmann2-0/+26
(cherry picked from commit 6bea5311d70f518444fe3218cf0b6f49bd93cc34) Conflicts: boost/ Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856
2013-08-23fdo#68076 RTF import: default font had priority over the specified oneMiklos Vajna3-2/+30
Regression from 60c17b2873506ed8b068b34840aecda0c1d9bd65. (cherry picked from commit f1e5e271f9aadc2c5e5af3ffae410b6c598e5398) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: Ie16d611622e6a814d5cbea00c3f992cd9ecba027 Reviewed-on: Reviewed-by: Fridrich Strba <> Tested-by: Fridrich Strba <>