summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-02-24Bump version to 4.3-3cp-4.3-3Andras Timar1-1/+1
Change-Id: I156f7a8565f930a3f0cc3de749e10243e82b48ab
2015-02-24dump ugly hack working around an ancient libxcb bug (tdf#89141)Luboš Luňák1-8/+1
According to the X protocol log in the bugreport, this timed function sometimes does time out, in which case the timestamp becomes 0, which as user timestamp is interpreted by window managers as "do not focus", which is indeed stupid to ask for just because a call timed out. Especially given that this is broken in principle, as the event is bound to come (barring the more than 5 years old libxcb bug, which must have been such a lame bug that it probably shouldn't even have been worked around, and definitely not unconditionally and permanently). Change-Id: I4d122ea038c0c56b1fda590df13bf119d746fd0a
2015-02-24Revert "fdo#68963 recognize __RefHeading__ bookmarks as TOC"Andras Timar2-17/+10
This reverts commit 2fd7f3ab66a5dca2adbe491b8f471470229ebe94.
2015-02-23Sun ld doesn't support -O1 optimize flagRichard PALO1-4/+1
reported by Gabriele Bulfon (gbulfon@sonicle) Change-Id: Ie0ff8fe296054a7a266b4c73c30938bb2b7353ea Reviewed-on: https://gerrit.libreoffice.org/14484 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 34a167e1bf9b478069c290dbf977c68639149852) Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f081a415221bd8665cceebe91665e2253781b516)
2015-02-23tdf#89460 test pChangeTrack before using itLaurent Godard1-2/+5
Reviewed-on: https://gerrit.libreoffice.org/14553 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit bf5c5f359cf4eb36a0a9a1110ec2aa3393bb87df) Conflicts: sc/source/ui/docshell/docsh4.cxx Change-Id: Ic02351c448929daa7d4c5a9a00df9842c2c5aa91 Reviewed-on: https://gerrit.libreoffice.org/14558 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit bf57bbef91bc40090561d614e4c2070c01aef7cb)
2015-02-23tdf#89105: sw: Remove unnecessary downcastMatteo Casalin1-2/+2
This fixes an infinite loop in SwPaM::DoSearch() that can happen with 32-bit paragraphs now. (cherry picked from commit dd9972f5f37063f5fe3eb5e011d2adc73f44d305) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: I7511862ddf6ed672ba4f09ef6729fb1fa7c1d355 (cherry picked from commit 620df179e0cc1339017a36840e19280f133b2a1a)
2015-02-23tdf#78174: toolkit: work around GCC 4.9 -Os link failureMichael Stahl3-9/+20
A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86 fails because of these undefined symbols: > nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep \\bWindowListenerMultiplexer::acquire U non-virtual thunk to WindowListenerMultiplexer::acquire() They should probably be generated inline. Work around by out-lining the definition of the methods. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812 (cherry picked from commit 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38) toolkit: export some ListenerMultiplexer types These are used from svx and apparently some (buggy?) toolchains fail with fmgridif.cxx:: undefined reference to `non-virtual thunk to WindowListenerMultiplexer::acquire()' (cherry picked from commit bb182b47ca7362b05c03d583d3547643d9a99562) Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5 Reviewed-on: https://gerrit.libreoffice.org/14510 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5e6cd9b7a15e7e6a994e8f3e4fafed2928dbf42d)
2015-02-23Resolves: tdf#39316 add matrix empty cells to ScInterpreter::QueryMatrixType()Eike Rathke3-7/+35
(cherry picked from commit eccbc97c7c224269fe261b8924e7866c3758ec91) add ScMatrix::IsEmptyResult() for tdf#39316 fix preparation (cherry picked from commit cf3f1d8dfeb45249eb60a30dba3243fe9a4a65e5) 9f2a3e6fa9f4ef43df672661afef996269b90a7a Change-Id: Ifa5d59e90afcfff66f2e8683fac2a9090ed615da Reviewed-on: https://gerrit.libreoffice.org/14430 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 5b952ced5b2ae6151079206c3e397de653f0ced2)
2015-02-23fix windows buildMarkus Mohrhard1-1/+1
Change-Id: Ifad245fac92e5e94347da3e5ac01ff3ba0a8c50b (cherry picked from commit 863c5e9e4b6ff1e4311665485d9e5ff2c08421d8)
2015-02-23tdf#88624 set DocumentBaseURL when saving reportLionel Elie Mamane1-1/+4
regression from 1d38cb365543924f9c50014e6b2227e77de1d0c9 Change-Id: Ia8cfe47b9d92889b3724f394db5090a59e69dd48 Reviewed-on: https://gerrit.libreoffice.org/14495 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 4ea953b468995675f2bcac02e1d512228aa7bb6e)
2015-02-23tdf#68117 Partially fix boolean labels in XLSXUrsache Vladimir1-1/+1
Change-Id: I731a58c7749e157f6b40c60808687ce629683742 Reviewed-on: https://gerrit.libreoffice.org/14410 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 9c0910765954fba7611611befc1d42ab19d010ef)
2015-02-23tdf#89330 preserve file name case in an unresolvable external named rangeJan Kantert4-4/+40
Reviewed-on: https://gerrit.libreoffice.org/14474 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 0a9e7293a570da8a36b2ac4fd1c4a22d6bc084f2) add unittest for tdf#89330 Reviewed-on: https://gerrit.libreoffice.org/14473 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit e4882717f3dc0375e113ed692374870ab8302a16) 4c5c65733700e7e7245e96f85714221acf23bcfb Change-Id: Ib8728a4a9c793b162de07a0cef66e242879f2aa1 Reviewed-on: https://gerrit.libreoffice.org/14483 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit c261beb79c56faf86dcae7d9cf092b11e1b8c66e)
2015-02-23tdf#88576 fix handling of empty arguments in IF(), IFERROR() and IFNA()Winfried Donkers2-3/+8
Reviewed-on: https://gerrit.libreoffice.org/14415 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 0b75eda1090f92adc678ceff2565da2dc7d9328c) tdf#88576 check that two parameters are given for IFERROR() and IFNA() Otherwise the functions failed only for the error case resulting in #NULL! error. (cherry picked from commit 6583f4e30015164af4972921b5bb7880dfb65f65) eb987637698ab418fc0a60cd873e23878c9f497b Change-Id: I8acca26cf7398768a9e25f97f3a9e61754ab2179 Reviewed-on: https://gerrit.libreoffice.org/14423 Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 14b76ff3a98898fcccfa6e48ca8ae1e7bea802e2)
2015-02-23Resolves: tdf#79569 crash undoing tricky cell mergeCaolán McNamara1-12/+13
Change-Id: I68d774d0d3758cdb67864d7939a7e1167dd9a7df (cherry picked from commit 21796a5fb92fd9773017b782a654a8b5a190cc66) Reviewed-on: https://gerrit.libreoffice.org/14468 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit b273a7b723d95f5feabf79b6e8a83beead1ce1bf)
2015-02-23Resolves: tdf#76636 crash on merging certain cells imported from a .docCaolán McNamara1-1/+1
Change-Id: I61d5088a6f2e0b444b2943a2f9ce9feeb2e09c11 (cherry picked from commit e1f4022b9ea7ae99a31773c445d8229ba3bdea93) Reviewed-on: https://gerrit.libreoffice.org/14464 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit a3c8e7deea306ba3efb513c8fa7311a995f7fc73)
2015-02-23Resolves: tdf#81429 select corresponding listbox entry if not currentEike Rathke1-8/+16
Change-Id: Ib475a43601ee22d33677ac45cd6ef9dba7e7c431 (cherry picked from commit a448f1bb9221f30f73574c580b506e00bf2ae61a) Reviewed-on: https://gerrit.libreoffice.org/14458 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dd8a5ecbc0afd7646583fa56b8e6efc3f040012c)
2015-02-23fdo#87534 fix HYPERLINK behaviour when used in namesWinfried Donkers1-0/+2
When using HYPERLINK() in names, the hyperlink was set to disabled on copying token. After fix, behaviour is consistent. Note: reducing the fix to 1 line does not work, a set hyperlink is only to be copied when applicable. Change-Id: I27ad24ed8912afa548f08d249ad51d18a792c275 Reviewed-on: https://gerrit.libreoffice.org/13920 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 944886f6d96843ca4f5833ecca48a693c81abc3b) Reviewed-on: https://gerrit.libreoffice.org/14449 (cherry picked from commit 8e89b2673af9e135b74ad93b08737962d6fee3d8)
2015-02-23Resolves: tdf#89252 Fix bold, regular font spacing bug for Graphite fontsMartin Hosken2-9/+13
Change-Id: I31a09fa753ed15e302e5407ce8a0c46f3b13e099 Reviewed-on: https://gerrit.libreoffice.org/14380 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0ed14401925d16932ed98bc418d395adac047b39) Reviewed-on: https://gerrit.libreoffice.org/14439 (cherry picked from commit 0c2447648961bc8fa4776f996604fead893e3be4)
2015-02-23Resolves: tdf#83461 do not override MatColsRows if already setEike Rathke1-1/+1
ScMatrixFormulaCellToken::SetMatColsRows() via ScFormulaCell::SetMatColsRows() is used during document import and preselected cell area input of an array formula. Do not override existing values with subsequent result matrix dimensions. Change-Id: I9e844b5064ea276f3cbcb680eb1127c344328e00 (cherry picked from commit e32eff2bb4c12fdc33e476b9f12bb4bb71d22ebc) Reviewed-on: https://gerrit.libreoffice.org/14355 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit cd1f5a81b7602040a7c88b30fd8dbde844fa2f71)
2015-02-23Query Design: use correct name for columns that come from another query.Lionel Elie Mamane3-4/+21
Change-Id: I25b4ccdc2f50ba89687e1f4c871f286251a28e21 Reviewed-on: https://gerrit.libreoffice.org/14344 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 97b11a21b64f4bac5af67819549f6e384d61c086)
2015-02-23tdf#89070 Table filter dialog: properly initialise OTableTreeListBoxLionel Elie Mamane1-0/+1
regression from .ui conversion: commit 5c72a213c7c4b588d0c1e0884ff2c46c22425faf Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 21 14:41:16 2014 +0000 convert table filter page to .ui Change-Id: I7bfb7698e2a5303b492766fba564c7b9033bcc52 Change-Id: Ic7d41d64d4c15eabf7b7f83a17482c473154434a Reviewed-on: https://gerrit.libreoffice.org/14343 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 120f748e81aefa863d6c425b85563dbbb70ae4c1)
2015-02-23tdf#79239: make the dialog closable with 'X' button againKatarina Behrens2-2/+8
that one of window manager, top-right corner mostly. We need to reimplement Close() method for this class - I don't quite get why this has to be the case, but all classes derived from ScAnyRefDlg do it as well. Change-Id: I3e94b7ee09f9b3581d054818d36ea4fb0fd55f78 (cherry picked from commit bd472c8a91976cda5fc5a45fccd2c782c6d44e73)
2015-02-23Resolves: tdf#83073 use loaded graphic's width/height as defaultsCaolán McNamara1-28/+42
(cherry picked from commit 4327ee505f8507f653c8f4db9ac7503db2e15c3a) Conflicts: sw/source/filter/html/htmlgrin.cxx Change-Id: Idad25f82d884c40c55b886fd7634a6c6e51693c4 Reviewed-on: https://gerrit.libreoffice.org/14402 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit d330d1cb36b81026e448dc371075b7bc8c75d33e)
2015-02-23Resolves: tdf#89179 fix Undo of Numbering Level change crashCaolán McNamara1-2/+2
regression from long paras presumably Change-Id: Ib89169e52e42fcbe6f8e1ab0a2eb9871d38ff06d (cherry picked from commit 29d2666d92e1105473f339609ba59e54a286b71c) Reviewed-on: https://gerrit.libreoffice.org/14419 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f45183c3c652b2c023d571ef56775ce5d3b27d2a)
2015-02-23tdf#73059 isDBReadOnly ensure connection before trying to retrieve itLionel Elie Mamane1-0/+1
Change-Id: I03f9b8ea72bd6906df61ccf05ead3670d7f90eb7 Reviewed-on: https://gerrit.libreoffice.org/14345 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 605c8d7f4c7b5b431747ced10243e01529b31777)
2015-02-23sw: fix ASAN detected error in RtfSdrExport::Commit()Michael Stahl1-1/+2
EscherPropertyContainer may allocate a 1-byte buffer if there are no vertices / segments. (happens in sw_filters_test) in EscherPropertyContainer::CreateCustomShapeProperties(MSO_SPT, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) filter/source/msfilter/escherex.cxx:3853:25 Change-Id: I56dedbd57d38cd017183060e924cb1340ea58ebf (cherry picked from commit e73799f8a9310f04074bc0dd88d9092094338576) Reviewed-on: https://gerrit.libreoffice.org/14336 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 7a046ddda3d8c7b8b94c6825349c7c143aafda68)
2015-02-23Resolves: tdf#82942 updating field contents with incorrect attribute positionsCaolán McNamara1-6/+22
Updating a SwTxtInputFld requires expanding the contents of the node. Expanding the contents of the node requires all the positions of fields in the node to be correct in order to expand them to the right place. So on updating a SwTxtNode wait until all the attributes positions are adjusted to be correct before expanding the SwTxtInputFlds in that node (cherry picked from commit 95f4b2f4a6dfe47842336116d94edd175a6da960) Conflicts: sw/source/core/txtnode/ndtxt.cxx Change-Id: I76500239a103e56be412707a708a303a58236070 Reviewed-on: https://gerrit.libreoffice.org/14254 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 6aa163f33d48326905f47e1f37ea26f992f4235f)
2015-02-23tdf#88854 crash on opening drop capsCaolán McNamara1-1/+3
Change-Id: I3ab56e4909d2a20dc8f0bafe0273e81065296f17 (cherry picked from commit 727c3e088698dfd21cf4beaa5455d4c4d5b495fb) Reviewed-on: https://gerrit.libreoffice.org/14319 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit ccf8e201bd825df0227af8ab9161c11e9db05bc7)
2015-02-23Resolves: tdf#68137 crash in traversing script fieldsCaolán McNamara1-2/+7
use the same guards as the SwFldEditDlg does (cherry picked from commit 38a65f76bc944ea730ebac7640dc135248ec3da0) Conflicts: sw/source/ui/fldui/javaedit.cxx Change-Id: I7d135cf969d9925cec57a90ef0fba8fe40f664eb Reviewed-on: https://gerrit.libreoffice.org/14324 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 9980636a5c3a499c299a8b6f4b93965f18bb4311)
2015-02-20LOfC MPL-only configAndras Timar1-0/+32
Change-Id: Ib680097315e59b1c31ba75352619f33151e176c2
2015-02-20webdav serf: remove SAL_OVERRIDE from destructorsAndras Timar2-2/+2
Change-Id: Id55b972dda34623eeb3e046a70757277377d3871
2015-02-19add test for tdf#89454Markus Mohrhard3-0/+40
(cherry picked from commit b13534de022972131b46f93f5ada90af155eec9e) Conflicts: chart2/qa/extras/chart2import.cxx Change-Id: Iefb52f6fa77cf90955dbb47c1b9ca7ab699a43eb
2015-02-19this should be [-90, 90] and not (-90, 90), tdf#89454Markus Mohrhard1-1/+1
Change-Id: I943be2cf660d2dc77eebd776208af96c0b5f67a4 (cherry picked from commit 0d1bd8c4f12d4e60d1f33f7df0a201d2affb7767)
2015-02-19fix chart2 unit test backportAndras Timar1-0/+1
Change-Id: I40a3816b0a942ca9dcdb84c0fe96b21c71496c9f
2015-02-19no need for that anymoreMarkus Mohrhard1-4/+0
Change-Id: I53002c0b97da66c44429b5ace0fc709b5e8a325f (cherry picked from commit de684f47da785c0da6194df1f582648ebf3d1569)
2015-02-19add test for missing chart area style fill import, tdf#89451Markus Mohrhard2-0/+19
(cherry picked from commit a9924d94e7db6db50b8b36a311f7d7abf80e4700) Conflicts: chart2/qa/extras/chart2import.cxx Change-Id: I052838eaf4134a72feb067fc2a1355fabcafe11f
2015-02-19better way to set default for chart area fill style, related tdf#89451Markus Mohrhard4-6/+12
Change-Id: Iee7fea0f55cf54d43a349b6cc0ffa25995069e40 (cherry picked from commit 32fe0c6adcff25a0df536127ca980413e1cabefd)
2015-02-19implement fill based on style also for chart area, tdf#89451Markus Mohrhard2-5/+10
Change-Id: I7b488e222cd44e75d1e0ff7f8e545e9399f418b5 (cherry picked from commit a51300bc9223b28fc5da6059e4fe1d2af62fb323)
2015-02-13cp#1000115 SwTxtFrm: don't join follow just because it has no contentMiklos Vajna5-32/+239
The problem was that the bugdoc had a table, and inside the table there was a long paragraph that flows to the next page, but only the paragraph mark of it does so. We first split the frame to have space for the paragraph mark, but later decided that all the content would fit the first frame, and this way the last hard line break and the paragraph mark was painted on each other. This is normally not a problem without tables, because SwTxtFrm::FormatAdjust() just calls SplitFrm(), sets its nNew flag to non-zero make sure that later SwTxtFrm::_AdjustFollow() doesn't try to join it, and we're ready. However, when the paragraph is inside a table, then the paragraph was formatted multiple times, and next time when we already had a follow nNew was not set, so even if there was a correct split first, the new frame was joined later. Fix the problem by explicitly setting nNew for the "in a table and paragraph ends with a hard line break" case, that way we don't blindly join the frame, only in case there is enough space for the follow in the master. (cherry picked from commit 7e33cce05b2df3f1761bcc66606c4d3b2b2671e9) Conflicts: sw/CppunitTest_sw_uiwriter.mk sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: Iede654740dcb0d8aa768d742ee330208291a383a
2015-02-08don't build/bundle local help filescp-4.3-2Andras Timar1-2/+1
Change-Id: I852d09cd8337cc23b1677b59d043a98b0ed66c4e
2015-02-08Bump version to 4.3-2Andras Timar1-1/+1
Change-Id: Ia880e079cc0e036d481c960ac57588f355f436f6
2015-02-06Re fdo#80538: Remove read-only infobar after "Save As..."Stephan Bergmann1-0/+1
...on a doc in r/o mode, which will switch to the newly saved document in r/w mode. Was missing from c6270de939d5ee51b61dc4ac02c52f1d9b5b1e47 "fdo#80538 Show an infobar when document is in read-only mode." Change-Id: Ie17f4213f989cb4b9d3f7fc114392ec6f516a965 (cherry picked from commit 02f76dec4c54ec7fb28729941c7044307058665a) Reviewed-on: https://gerrit.libreoffice.org/14012 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-06widget leak on filling non-existing infobar in helpCaolán McNamara1-0/+8
Window () with live children destroyed: PushButton (Edit document) Change-Id: I2aa05f59f08cfa78ba895933ef298908a9cbb675
2015-02-06fdo#83302 don't display read-only infobar for Base form in normal modeLionel Elie Mamane1-1/+7
Change-Id: I03c32883dbf8421824069efea2318e67c8dc4313 Reviewed-on: https://gerrit.libreoffice.org/11231 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-02-06fdo#83311 Fix infobar for documents with read-only propertySamuel Mehrbrodt1-1/+4
Change-Id: Ic813ab3eb74a088b60b4dc3dcd56e7b19683190c Reviewed-on: https://gerrit.libreoffice.org/11220 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
2015-02-06fdo#80538 Show an infobar when document is in read-only modeSamuel Mehrbrodt20-30/+31
and remove the Edit icon from the toolbar Reviewed-on: https://gerrit.libreoffice.org/11182 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Conflicts: include/sfx2/sfx.hrc include/sfx2/viewfrm.hxx Change-Id: I27d9506bd0fb76b3f1ad056a9866f7744674a3e2
2015-02-06fdo#80536 UI: Menu entry for 'Edit File' -> 'Edit Mode'Joren De Cuyper11-2/+20
In this commit not only a menu entry is created, also the name is changed from 'Edit File' to 'Edit Mode'. Change-Id: Icd7998307cb0337dd2ee95b298452557ab37375b Reviewed-on: https://gerrit.libreoffice.org/10211 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-02-06bnc#637947 improve DrawingML export of custom shapesAndras Timar5-22/+139
Reviewed-on: https://gerrit.libreoffice.org/14346 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit b1751e6ed0fd6d6d26141e4405df92520e3c04cd) Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport4.cxx Change-Id: Iaa880528cf3c899ce66e4349c6d989dfbe5cbeb6
2015-02-06Resolves: fdo#84887 TabBar::ImplShowPage crashCaolán McNamara3-5/+407
(cherry picked from commit ff7c2cd0dc89f0ffa6742f1f5dcf89f5a6f03839) Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Change-Id: I84250c6a40baeabd0d12958dfe0aea346d2b4fc8
2015-02-06Resolves tdf#89129: crash when defining a specific relationshipJulien Nabet1-5/+3
Returns early if comparison matches so you can reduce iterator scope and avoid last test for logging. Cherry-picked from 30f6ec7cfdf63cea265148bbe3a07d8df34e96d5 /usr/include/c++/4.9/debug/safe_iterator.h:168:error: attempt to copy- construct an iterator from a singular iterator. Objects involved in the operation: iterator "this" @ 0x0x7fffffff3a30 { type = N11__gnu_debug14_Safe_iteratorIN9__gnu_cxx17__normal_iteratorIPPvNSt9__cxx19986vectorIS3_SaIS3_EEEEENSt7__debug6vectorIS3_S7_EEEE (mutable iterator); state = past-the-end; references sequence with type `NSt7__debug6vectorIPvSaIS1_EEE' @ 0x0x7fffffff4088 } iterator "other" @ 0x0x7fffffff3a90 { type = N11__gnu_debug14_Safe_iteratorIN9__gnu_cxx17__normal_iteratorIPPvNSt9__cxx19986vectorIS3_SaIS3_EEEEENSt7__debug6vectorIS3_S7_EEEE (mutable iterator); state = singular; references sequence with type `NSt7__debug6vectorIPvSaIS1_EEE' @ 0x0x7fffffff4088 } 4 0x00002aaab193d6e9 in boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ImplBtnDlgItem>::base (this=0x7fffffff3a90) at /home/julien/compile-libreoffice/libreoffice/workdir/UnpackedTarball/boost/boost/ptr_container/detail/void_ptr_iterator.hpp:121 5 0x00002aaab193d269 in boost::operator==<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ImplBtnDlgItem, __gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ImplBtnDlgItem> (l=..., r=...) at /home/julien/compile-libreoffice/libreoffice/workdir/UnpackedTarball/boost/boost/ptr_container/detail/void_ptr_iterator.hpp:179 6 0x00002aaab193c2ca in ButtonDialog::RemoveButton (this=0x7fffffff3d90, nId=1) at /home/julien/compile-libreoffice/libreoffice/vcl/source/window/btndlg.cxx:340 7 0x00002aaad8ed109b in dbaui::ORelationTableView::lookForUiActivities (this=0x317ef30) at /home/julien/compile-libreoffice/libreoffice/dbaccess/source/ui/relationdesign/RelationTableView.cxx:342 Change-Id: Ied45c222c94d2a362075a3b1550b6092aad77c62 Reviewed-on: https://gerrit.libreoffice.org/14325 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-on: https://gerrit.libreoffice.org/14349