[Libreoffice-commits] core.git: Changes to 'private/jmux/libreoffice-4-1-6+backports'
Thorsten Behrens
Thorsten.Behrens at CIB.de
Fri Jan 26 18:05:30 UTC 2018
New branch 'private/jmux/libreoffice-4-1-6+backports' available with the following commits:
commit 629e6fc59c42f3723b35d03947f47dffae4f7592
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Fri Jan 26 16:13:23 2018 +0100
tdf#115090 keep internal BaseModel alive long enough
There's reams of code already preventing a close during save
(SfxSaveGuard), but this looks equally effective. Avoids
SfxBaseModel::dispose() pulling the rug under us, when
SfxBaseModel::postEvent_Impl() wants to access parts of the
interface containers during notification.
Conflicts:
include/sfx2/sfxbasemodel.hxx
sfx2/source/doc/sfxbasemodel.cxx
Change-Id: Iace1f9922c47a97ab2e798b577c6aec8a729da48
commit 3d45bb528ef9c67d3733f13238b92a48312122f7
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jul 7 12:23:47 2017 +0200
Mark "LOCKFAILED" strings as "translatable"
Explicitly mark them as '[ en-US ]'.
Change-Id: I0335cc2c59595302f224f755ab3ea372805d2407
commit e264bfb6c1fd1b5d50be865384b2077633865cb2
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jul 7 12:23:03 2017 +0200
SAL_OVERRIDE build fix
Change-Id: Iab945bb4866077421e985fe4d01a26dd8abd8f8f
commit ce2c2375a3e9b50a58d2f347f441541b6f5dc720
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Wed Jul 5 23:45:43 2017 +0200
tdf#108055 RTF: Header and footer are added multiple times
trac#21081
accidentaly backporting also fix of rhbz#988516 and tdf#75573,
couldn't separate them from the context
Change-Id: I55de8a8a1e577769b396e635a864274a73a18301
commit db77924c875840d971b642116c3f535791f81ceb
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Jun 21 14:41:49 2017 +0200
Improve tdf#106942: always erase empty/corrupt lockfile
trac#19027
also when we could not create lockfile, not only when open as readonly
Reviewed-on: https://gerrit.libreoffice.org/39054
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit af9bea21390800e5bbc73e07ce9828189d8dabf3)
Conflicts:
sfx2/source/doc/docfile.cxx
Change-Id: Ied53bbfe47669f62553d97d81f0bed156ae58887
commit 0407078bd2ff2633ae282d4ee3c7d59c764ee46e
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Apr 12 11:26:10 2017 +0200
tdf#106942 Wrong message when lock file is empty or corrupt
trac#19027
1. Erase empty or corrupt lockfile, when reading it fails and
skip "Locked Document Dialog" in that case
2. Show Dialog (use LockFileIgnoreRequest -> LockFailedQueryBox)
when create lock file is not possible.
Two Dialogs: "lock file create error" and
"empty lockfile is present"
Set the document to read-only when creating lockfile is not
possible. If lockfile is corrupt or empty, inform the user.
They can interrupt loading the document or open it read-only,
which also erases the corrupt lock file after closing
the document
3. Handling for the two Dialogs
Use LockFileIgnoreRequst for create lockfile error and
add a new LockFileCorruptRequest, (lock file is corrupt).
Change and generate new messages for both dialogs in english
Reviewed-on: https://gerrit.libreoffice.org/36658
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 6ca3b3648e25ae9d4d2d29a0df83349198ec3f5e)
Conflicts:
include/sfx2/docfile.hxx
l10ntools/source/gRun.sh
sfx2/source/doc/docfile.cxx
svl/source/misc/documentlockfile.cxx
uui/AllLangResTarget_uui.mk
uui/source/iahndl-locking.cxx
uui/source/iahndl.hxx
uui/source/ids.hrc
uui/source/lockfailed.cxx
uui/source/lockfailed.src
Change-Id: I35c377f85b5113e8ffb89d83b9544b8ebc81d89f
commit fdfda3fba4267a9b52e62b20bc94983091398f7a
Author: Eike Rathke <erack at redhat.com>
Date: Wed Feb 11 23:44:00 2015 +0100
Resolves: tdf#39316 add matrix empty cells to ScInterpreter::QueryMatrixType()
(only partial cherry-pick, ScMatrix::IsEmptyResult needs newer mdds)
(cherry picked from commit eccbc97c7c224269fe261b8924e7866c3758ec91)
Change-Id: Ifa5d59e90afcfff66f2e8683fac2a9090ed615da
commit 86a9cf80c88d380dbee5111c587bf09ea9b424d6
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Thu Mar 9 10:08:06 2017 +0100
tdf#35636: Match also empty cells (backport of the idea)
Change-Id: I11fc198ef43250618b43e3c11e7c192accc6b7b8
tdf#35636: Apply algorithm also to ranges spanning multiple columns
Change-Id: I6e574f2237dd6d4dcf4438a9fdafadb66aa049c5
commit 8999ca283d3bca6692836ea85f89fdf0fca26fca
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Wed May 10 15:30:39 2017 +0200
Get string also for external reference to double for operands of '&'
In a formula like ='ExtRef1' & 'ExtRef2', or ='LocalValue' & 'ExtRef1'
empty string became an operand in concat operation if the referenced
external cell was a non-string one.
trac#17184
Change-Id: I7b0ac5de68349eae85afe48f377e30cab76e3fbf
Reviewed-on: https://gerrit.libreoffice.org/37469
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Eike Rathke <erack at redhat.com>
commit b50c0aa472fd8140dccbf6f26c62bd648afb667f
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Thu Dec 8 12:25:50 2016 +0100
Stop question in context of session manager when cancel a frame
When shutdown or logout, LO make the question for all open
windows, but when you cancel a window the question for the other
windows are not necessary, this patch breaks the other questions.
in dependency of tdf#104101
trac#19800
Reviewed-on: https://gerrit.libreoffice.org/33311
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit d8ccf8cf7a604cb1df04f23b5b5036fff1d4afdb)
Conflicts:
framework/inc/services/desktop.hxx
framework/source/services/desktop.cxx
Change-Id: I7119317d392ccd808c67fb57f82b1e990062abf2
commit 9c17ad0d54a16324123562ec4c8c9e5e07facd63
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Thu Dec 8 15:41:24 2016 +0100
tdf#104101 Improve the session management handling
- Set the current time to the SessionID
- Split the SetProperties-Data, and send
DeleteProperties for DiscardCommand
(above both topic is the same as kate and
plasma-desktop to do)
- in statusChange the saveDone was not called, and
call only once the saveDone
- in shutdownCanceled must be send the saveDone too
trac#19800
Reviewed-on: https://gerrit.libreoffice.org/33215
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit f57424cc4c0dd68083c7935ce8a9b795625cf84c)
Conflicts:
framework/source/services/sessionlistener.cxx
vcl/unx/generic/app/sm.cxx
Change-Id: I42855c75b88b5d651ef8091947e359dc2c3f9209
commit cd1b279ccdf4b38e36931d2638a0a67d6aa3744f
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Thu Dec 8 15:37:10 2016 +0100
Expand and improve the output log in Session-Management
in dependency of tdf#104101
Reviewed-on: https://gerrit.libreoffice.org/33034
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
(cherry picked from commit fe9c6fa5a43177f4d77766f29d44784e17f53320)
Conflicts:
framework/source/services/sessionlistener.cxx
include/sal/log-areas.dox
vcl/source/app/session.cxx
vcl/unx/generic/app/sm.cxx
Change-Id: I799f81adf4e4751fb505c84aa075363acf70f5a7
commit 9b7ffa74c1fdf7524b7baaa5dbe479e884b0da78
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Fri May 16 15:03:31 2014 -0400
fdo#77315: When in cell edit mode, use the EditView instance already there.
trac#20518
This prevents creation of a temporary EditView instance which would mess up
the cursor state while the mouse pointer is hovering.
(cherry picked from commit df51f7d486cafb2795a38ae9fedd8fde8827d8a4)
Conflicts:
sc/source/ui/view/gridwin.cxx
Change-Id: I7759667b105b4389dd4de2673cd2fbe32082c95d
commit 9b928808c5bc993e20a529fa9ae89c3e6abbf638
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Mon Jan 23 12:19:38 2017 +0100
New Log with timestamp
docu in header file
From master 58a6cbfbf309b151b9d1463c734343430f9a1220 copied
conflict:
sal/osl/all/log.cxx
Change-Id: I8d74baee3aa8d41a821077221f62e862322d24e7
commit 04345b68754892814f924719ba4e35919f4965e6
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Mon Jun 16 10:43:08 2014 -0400
Cache table entry may be null. Let's not assume it's always non-null.
This is done intentionally because we do need correct table index when
resolving external reference. This requires we do need to allocate array
with the same sheet size as the remote document. But we don't allocate
Table instances for remote sheets that we don't reference, to save
memory.
(cherry picked from commit 3dcfb9a892e528a386bb304e4e00d2fa34b1de25)
Conflicts:
sc/source/ui/docshell/externalrefmgr.cxx
Change-Id: I27fb6228f0e4558327aa4a04a6bccce8d2f1085f
commit 5e0222e562ed824954a59bd36cd91749bb4052a4
Author: Martin Nathansen <marsianer at gmail.com>
Date: Wed Nov 23 19:37:21 2016 +0100
cp#1000072: Populate cache tables when updating all - code cleaned
RefCache cannot be enabled because therefore ColumnSpanSet:executeColumnAction
needs to be implemented. So just code cleanup.
Change-Id: Ie39a7afa2671afa66294cc05ad61a32ab77c52b9
commit cc57783dc9bd56af41a340adc23e0168dd9f80d6
Author: Martin Nathansen <marsianer at gmail.com>
Date: Tue Nov 22 16:21:19 2016 +0100
cp#1000072: Populate cache tables when updating all - fix (1)
patches are functional with disabled ref cache
Change-Id: I5471c870c568a7e765f09d2d2fe382a136f0e7f4
commit 4126c220e7087c0a1973164530edbf3d4d087ef6
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Tue May 20 13:57:13 2014 -0400
cp#1000072: Populate cache tables when updating all external links.
This way, even after the loaded doc shells get purged due to timeout,
we won't reload those external documents from disk again. One caveat
is that we currently don't pre-populate empty cells even if they are
referenced by the host document.
(cherry picked from commit 8d5d877dc94ba5edfc7587b957ca5a00725d434b)
Conflicts:
sc/inc/externalrefmgr.hxx
sc/source/ui/docshell/externalrefmgr.cxx
weitere Änderungen:
neue Datei: include/svl/sharedstring.hxx
neue Datei: include/svl/sharedstringpool.hxx
geändert: sc/inc/document.hxx
geändert: sc/inc/externalrefmgr.hxx
geändert: sc/source/ui/docshell/externalrefmgr.cxx
geändert: svl/Library_svl.mk
neue Datei: svl/source/misc/sharedstring.cxx
neue Datei: svl/source/misc/sharedstringpool.cxx
Change-Id: I1de2987836bf2fc5d9d7044b406fb99faa534164
commit bc14a351e1b561499a10d2dee438847373e93ac8
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Tue May 20 10:19:25 2014 -0400
cp#1000072: Purge one document shell at a time, to avoid freeze.
Import especially when we have a whole bunch of large-ish documents open
in the background.
(cherry picked from commit 65d026f39cff52c96be95871e16a3d6714203d2e)
Conflicts:
sc/source/core/data/documen8.cxx
Change-Id: I614e6daab3481c09dae47c8407497d77aec40480
commit 5a8d3f36e47d338715141b0b6c5c89b2509417d3
Author: Martin Nathansen <marsianer at gmail.com>
Date: Tue Nov 22 13:08:53 2016 +0100
cp#1000072: Stop the external doc shell timer - fix conflicts (1)
reverting back document8.cxx (progress bar)
Change-Id: Iecaf3704ebeeaef0477980462dff358f55ad1273
commit 2bc9870d132738c639147e979854f8c8b23362fa
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Tue May 20 00:59:29 2014 -0400
cp#1000072: Stop the external doc shell timer while mass-updating.
To prevent collision with the timer wanting to purge the doc cache
while updating external links.
Also, show progress bar, and make the timer interval and the document
cache life span longer.
(cherry picked from commit c28aadc7fcb1858acc2e59a875e0a4c9071681ed)
Conflicts:
sc/source/core/data/documen8.cxx
Change-Id: I325984c8fa68425a2621cf8f9c016463291afc89
commit 712126d9c99f252970fe1fd2fb25abe91382ffc6
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Mon May 19 23:42:05 2014 -0400
cp#1000072: Load external documents when refreshing caches.
Rather than just clearing the existing caches and loading the external
documents on demand as the formula cells gets re-calculated. This has two
advantages: 1) when the loading itself fails, we can keep the existing cache
rather than turning all affected cells to error cells, and 2) this prevents
on-demand loading after the external linkes get refreshed, which can make
scrolling very slow & painful.
Change-Id: Ie8243f6f94c5e477964413ab83f6b4b746fe3220
(cherry picked from commit 1b243b14e9715b7b7da6359b5b752ee6d8278731)
commit 340cde92af0b509d396a6b4f67b141d0586fcade
Author: Kumar Thangavel <kumarr908 at gmail.com>
Date: Thu Feb 4 12:02:26 2016 +0530
tdf#65206 Highlighted (colored) references limited to 32 references in formula
Reviewed-on: https://gerrit.libreoffice.org/22094
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit e6c4b88f5bc4887aa498b2896b1261a4022affca)
Conflicts:
sc/source/ui/app/inputhdl.cxx
Change-Id: I45731be3d7c3a8ebbafb11d8580294dab01784f4
commit bc6d1e52a8de2b70266d830c182c1e1b7a5875d7
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Tue Dec 15 14:44:44 2015 +0100
tdf#86784: Pass custom options to Java bootstrap
trac#19825 Backport zusätzlicher Parameter nolockcheck, nores...
Reviewed-on: https://gerrit.libreoffice.org/20720
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
(cherry picked from commit 02002f83f156117cf178532d48abaa9319ee8cb4)
Zusätzlicher Default-Parameter der 4.1.6 mit hinzugefügt
--nocrashreport
Conflicts:
javaunohelper/com/sun/star/comp/helper/Bootstrap.java
Change-Id: I9e9c78387627e173dea8062e4a3f16bc396e8115
commit 3bfb0c3110f262e08c5505a3c31f3b0072362457
Author: Eike Rathke <erack at redhat.com>
Date: Fri Dec 12 14:49:09 2014 +0100
resolved fdo#86809 connect filter conditions correctly
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)
commit 3a8189e1934f9d88e263e6a86495e2be40153ece
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Oct 10 16:21:29 2014 +0200
fdo#84679 RTF import: fix paragraph spacing handling in tables
Regression from commit 1be0a3fa9ebb22b607c54b47739d4467acfed259
(n#825305: writerfilter RTF import: override style properties like Word,
2014-06-17), we failed to do the proper deduplication in buffered
content, like tables. Fix this by adapting
RTFDocumentImpl::replayBuffer() to RTFDocumentImpl::checkNeedPap(),
which already did the proper deduplication.
To be fair, the inconsistency was there earlier since
9f5263c477b82fef5aa9c3e79fb6af92aa049e24 (fdo#44736 RTF import: ignore
direct formatting which equals to style, 2012-11-25), but it caused no
real harm earlier.
(cherry picked from commit e34906d20c9febc420b115fa2a8b171826dea0be)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: I0673408088d9d83768f0780ea92ece87913d03f3
(cherry picked from commit 7d799ae51e9b97bb27ade082b670d3c1c5b1465c)
commit 106d66b35d37d86c9393594286947e22f5ab1fb4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 18 10:42:02 2016 +0100
protect against empty m_aTableManagers stack
(cherry picked from commit 9d76d9d9abb08788f2882612cfe6d0df6e19af39)
Reviewed-on: https://gerrit.libreoffice.org/27281
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
(cherry picked from commit 808d72592aa6e9a9f9a8eddd4dada0fa9f14749c)
Reviewed-on: https://gerrit.libreoffice.org/27320
Reviewed-by: Eike Rathke <erack at redhat.com>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit f80bcfb2907bb4c2999280c8d1be060292122659)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: I29fecc5e0efb3b3d907f0c6505d42818fa464ffc
(cherry picked from commit bc59a7ed0c5de4cabf897bf947c2487f1ec1deb6)
commit 8547e3305cbd3e49594f8055f247797fef4188d1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 10 14:41:42 2014 +0100
clip PolyPolygon::Insert on .svm load
valgrind + bff
(cherry picked from commit fd64d444b730f6cb7216dac8f6e3f94b97d7ab60)
Conflicts:
tools/source/generic/poly2.cxx
Change-Id: Ib3ed8a6e518c0686f8cbeaf021b9ca3a07005032
Reviewed-on: https://gerrit.libreoffice.org/11382
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 6db17c300e59884e652125a0b3b11bdffdea38e2)
(cherry picked from commit 2b8c99badf330a8d55caa34cd35af78134a9df9f)
commit 0abb72abefffc2f365d5261e4196510e84a18c7b
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jul 29 20:32:47 2016 +0200
MM fix multi-page PS CUPS printing
When printing multiple pages, reset the last page boolean in the
controller, as StartJob will set it at some point for the record
set.
Otherwise all documents after the first record set just contain
the first page and all others will be empty, as the controller
assumes the last page was already reached.
Change-Id: I7dc3d1826386a19bcae39341f7368458c6848736
(cherry picked from commit 4395b43b8bee16183f388beb9867c2845990fe90)
commit 9b5ded25be36105b8214f6c84a5a68d3864975a3
Merge: 0d953152594a 2399f6bc560c
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Tue Jul 19 11:43:42 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 2399f6bc560c16b6d27e35c449783ab0ffb961e8
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Jul 15 11:56:02 2016 +0200
tdf#100929 - Windows Installer: "ADDLOCAL=ALL" doesn't set all features
trac:14203 Spanisches Wörterbuch nicht vorhanden
The CustomAction "SelectLangauge" overrides the ADDLOCAL-switch.
When ADDLOCAL is set, skip the CustomAction "SelectLanguage"
Reviewed-on: https://gerrit.libreoffice.org/27230
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 0a76a41ae7a2ebd53f80f01ea9e2bcff3026d155)
Change-Id: I716349a0645e2f8dd193103b35028e493ca8e3a1
commit 0d953152594a7db6b72468000112c4182d37a477
Merge: 878392d27e42 f3a4c008f723
Author: Martin Nathansen <marsianer at gmail.com>
Date: Thu Jul 7 12:31:02 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports'
Conflicts:
sc/qa/unit/subsequent_filters-test.cxx
Change-Id: Ia8f99d6f0956a84b5986dcc99f49d1920f7aaa12
commit f3a4c008f723a9c9a93fc6a13dfbc42ccd78c06a
Author: Martin Nathansen <marsianer at gmail.com>
Date: Thu Jul 7 12:06:06 2016 +0200
tdf#100458 Fix unit test for: Don't forcefully change cell type
fix unit test: ScFiltersTest::testTdf100458()
Change-Id: I94dfa4011e8336c5a250a61e4f957788f4011d01
commit 878392d27e42154d49a6ae5f84f442a987879973
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jun 17 21:22:02 2016 +0200
tdf#100458 Don't forcefully change cell type
Just quoting the source comment from the breaking commit
61c39eae570d6d6040b65bfe93127b30e6080cc8.
// If a matrix formula has a matrix reference cell that is intended to
// have // a blank text result, the matrix reference cell is actually
// saved(export) as a float cell with 0 as the value and empty <text:p/>.
Ok
// Import works around this by setting these cells as text cells so that
// the blank text is used for display instead of the number 0.
This seems to be wrong.
Forcing the cell to a util::NumberFormat::TEXT actually kills
the cell value, if the text is a result of the formular.
I'm not sure if forcefully changing the cell format at this point is
correct at any time, if a cell type was already determinated.
I imagine that an undefined cell type should probably be fixed at the
end of the row import, if Calc detected an error case, or even generally,
This patch is just a minimalistic initial fix. If it's correct, it
probably needs an additional code comment.
Reviewed-on: https://gerrit.libreoffice.org/26435
Reviewed-by: Eike Rathke <erack at redhat.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
(backported from commit 21a3d78cf080dc4d86edab2a7378055a2d848bfe)
resolves #18524 Datenverlust: CalcSheet aus OpenOffice - Benutzer-
definiertes Zellenformat - Auswertung in LibreOffice nicht mehr moeglich
Change-Id: If7d9d69467d56c7d8fd2444f9e8b3ae906285264
commit ab50484bfe3e129fca0528b49e2bf46be53f0c63
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jun 17 21:22:02 2016 +0200
tdf#100458 Don't forcefully change cell type
Just quoting the source comment from the breaking commit
61c39eae570d6d6040b65bfe93127b30e6080cc8.
// If a matrix formula has a matrix reference cell that is intended to
// have // a blank text result, the matrix reference cell is actually
// saved(export) as a float cell with 0 as the value and empty <text:p/>.
Ok
// Import works around this by setting these cells as text cells so that
// the blank text is used for display instead of the number 0.
This seems to be wrong.
Forcing the cell to a util::NumberFormat::TEXT actually kills
the cell value, if the text is a result of the formular.
I'm not sure if forcefully changing the cell format at this point is
correct at any time, if a cell type was already determinated.
I imagine that an undefined cell type should probably be fixed at the
end of the row import, if Calc detected an error case, or even generally,
This patch is just a minimalistic initial fix. If it's correct, it
probably needs an additional code comment.
Reviewed-on: https://gerrit.libreoffice.org/26435
Reviewed-by: Eike Rathke <erack at redhat.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
(backported from commit 21a3d78cf080dc4d86edab2a7378055a2d848bfe)
resolves #18524 Datenverlust: CalcSheet aus OpenOffice - Benutzer-
definiertes Zellenformat - Auswertung in LibreOffice nicht mehr moeglich
Change-Id: If7d9d69467d56c7d8fd2444f9e8b3ae906285264
commit e5483e0369edd25dd878b1ab25cde7a813a6a029
Merge: dca5d7204fdd f83f3d3b2f04
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Jun 10 14:10:29 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit f83f3d3b2f04b74a79b787fc58528a595587acfd
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Jun 10 13:59:58 2016 +0200
trac#18016 WollMux hindert LibreOffice am "sich beenden nach Speichern" (2)
Ohne diesen patch hat LibreOffice immer OKAY über den WollMux
zurückgeliefert, beim Speichern, auch wenn das Speichern
(Speicher, Speichern Unter) nicht funtioniert hatte.
Change-Id: Ia585dab101ea9eb7624f338eb37b7432a2f74760
commit dca5d7204fdd04fb5ad781e538e17d3521505a22
Merge: 3961a3b2fc9c f3a860256590
Author: Martin Nathansen <marsianer at gmail.com>
Date: Mon Jun 6 17:18:14 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit f3a8602565908b5b4b5aeb12cbd90eae6c29cf61
Author: Oliver Specht <oliver.specht at cib.de>
Date: Mon Apr 25 13:25:39 2016 +0200
tdf#99434: import/export documentProtection-forms from .docx incl. test
the setting <w:documentProtection w:edit="forms"> disables editing of content
outside of form controls.
Reviewed-on: https://gerrit.libreoffice.org/24365
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht at cib.de>
(cherry picked from commit 523a3d18e98cd51aa8bf76cf76314a22ddc2b2cf)
Resolves: #10586 Import von .docs mit Bereichen (2/2)
ToDo: Unit Test
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
sw/source/filter/ww8/docxexport.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/SettingsTable.hxx
Further Changes:
sw/source/filter/ww8/wrtw8sty.cxx
sw/source/ui/config/optcomp.cxx
sw/source/ui/config/optcomp.hrc
sw/source/ui/config/optcomp.src
Change-Id: I0d11373d9010778ed5798598020e453cde06fa0f
commit 529345cd41aae4c3917c277687e1c7b7532f0430
Author: Oliver Specht <oliver.specht at cib.de>
Date: Fri Apr 22 11:20:02 2016 +0200
tdf#81833: form protection can be modified as compatibility option
ProtectForm is supported to prevent editing outside of form controls
but could only be imported from doc and stored in odt but not changed.
Now it is part of Writer's compatibility settings dialog.
Reviewed-on: https://gerrit.libreoffice.org/24294
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht at cib.de>
(cherry picked from commit 8d41866f76ce3909b8d1bba6d0b74c4acb91202b)
Resolves: #10586 Import von .docs mit Bereichen (1/2)
Conflicts:
include/unotools/compatibility.hxx
sw/source/core/view/viewsh.cxx
sw/source/ui/config/optcomp.cxx
sw/uiconfig/swriter/ui/optcompatpage.ui
Change-Id: I7337fb3f0774d3c1d26cd8e1485958399b2a70e2
commit 3961a3b2fc9c4d429e3fcadac012d99ccc6d4056
Merge: f64ab591fd32 d5e17c5f5785
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed May 11 10:43:30 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit d5e17c5f578549bfc109a5d20c917163e6ebfc45
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed May 11 10:32:56 2016 +0200
trac#18016 WollMux hindert LibreOffice am "sich beenden nach Speichern"
Copy of the DispatchHelper, not wait
only test, is a result available
Change-Id: I5f1ecaa51137b749213ed584a6d863325cdd1c39
commit f64ab591fd32533db6d233f0e6742ee5204b2e3e
Merge: bd7d17309e6b de865746d692
Author: Martin Nathansen <marsianer at gmail.com>
Date: Wed Apr 20 17:52:31 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit de865746d69248d6e82579491dd4a40ae07de737
Author: Martin Nathansen <marsianer at gmail.com>
Date: Wed Apr 20 17:40:19 2016 +0200
tdf#16671 DDE-Verknüpfung: Ändern der Quelldatei (fixed)
backported from 6a92ada1f624b3d37976845517595e15ed5a73f6
Change-Id: Ibb35118112f92003d5da04d972bfcae267230ea7
commit bd7d17309e6bcb9ef1d5b3251ba033f6d3f620dc
Merge: 5e83d83db7f3 f5abf63ee764
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Apr 20 13:17:00 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit f5abf63ee764f153826e6f6d25180c0e482c4b2a
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Apr 20 13:10:38 2016 +0200
Set the new copyright 2016
Change-Id: Ied5baa5f7342ab3fb069257953b62ccaba9f13bf
commit 5e83d83db7f3c25d67082b17b7f416ffc926bf47
Merge: 983b6c62a196 377769294f26
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Apr 20 07:56:33 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into
private/jmux/libreoffice-4-1-6+all
Conflicts:
sc/source/ui/app/transobj.cxx
sc/source/ui/view/viewfun5.cxx
Change-Id: Ifccc6f148e26fee80e15d28191833832209f7481
commit 983b6c62a196034a943ac48b395e95295c983611
Merge: f4fd02061abc 87b885b373ab
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Apr 20 07:49:02 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 377769294f2615c4cf239e5c1e60d36c0be91026
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Apr 15 12:05:12 2016 +0200
trac#14139 LO Calc DDE-Verknüpfung (LO 4.1.6V3)
- improve the PastLink Dialog
- improve the Handling
- change the home-dir to ~/...
- remove workaround
Change-Id: I6693ec684a26ba9bbf6a139c276007ea33fc317d
commit 9930840f7501f3e50a8c02f85a8dae42bcfa5522
Author: Martin Nathansen <marsianer at gmail.com>
Date: Thu Apr 7 11:14:48 2016 +0200
tdf#14139 LO Calc DDE-Verknüpfung (LO 4.1.6V3)
Change-Id: I7c3a630cbfd1e08308e764c5caa85696b6e4f2f1
commit 87b885b373abde59ad8d0ffa18d5d17c14426e4a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Aug 18 15:24:24 2015 +0200
Simplify from ucbhelper::getSystemPathFromFileURL & v. v. to osl::FileBase
(vnd.sun.star.wfs is long gone); pending further clean up
- solve the DDE-link-problem with ~/...
look to trac#14139
Conflicts:
unotools/source/ucbhelper/localfilehelper.cxx
Change-Id: Ie532c1d945c20a31f7758fbc0438e6b1f5d5c843
commit f4fd02061abc80dbee7161a7d5489d11c7f322a0
Merge: 1957cd295b3d ebc7c563a7a3
Author: Martin Nathansen <marsianer at gmail.com>
Date: Thu Apr 7 14:10:06 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit ebc7c563a7a3d24eba6cd2169150ebf9bbd1a4e7
Author: Martin Nathansen <marsianer at gmail.com>
Date: Thu Mar 17 17:40:16 2016 +0100
tdf#16203 Diagramm-Achse Calc-Writer ohne Format
Change-Id: I498eccfdee4e39c8fc4916f58fcd73333dffdd95
commit 1957cd295b3d3baaada2b18f2665d963fdd7f64f
Merge: 50a4ee2fc289 bf0b3c06f7cd
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Apr 6 12:57:11 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit bf0b3c06f7cd4e6c0189a4dc058a22b14ab4f461
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Feb 24 13:13:23 2016 +0100
tdf#79787 Normal cell borders are showing dashed/dotted reopen in MSO
trac#16702 [LO4.1v3] [LO5.0]: Umrandung .xlsx
Adapted the mapping for 4.1.6v3
New Mapping from LO to MS, decription in
sc/qa/unit/data/README.cellborders
Add a Unit-Test for testing the mapping
Reviewed-on: https://gerrit.libreoffice.org/22665
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 51737960911d41593ffd9792a6a85aeaa86824fd)
Conflicts:
sc/qa/unit/subsequent_export-test.cxx
sc/source/filter/excel/xestyle.cxx
sc/source/filter/oox/stylesbuffer.cxx
Change-Id: I5324bf85b6299dbc63ce3c8ef479f19b0b1b3f1f
commit 50a4ee2fc2898d408447d7c2a023120f3e63422c
Merge: 42032aa76097 23737ee48d22
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Mar 29 17:11:18 2016 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all
commit 23737ee48d220738265245684395eec975cc89c2
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Mar 29 16:52:00 2016 +0200
Don't build wiki publisher extension
Change-Id: I81fd0ad5e7b8ba898c8ef8bba8f8707b4841d3c0
commit 42032aa760974ffacf8d8afa7d708270888eb619
Merge: 9f96d39dcfb4 89127a2859e5
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Mar 16 18:40:33 2016 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit 89127a2859e536334bd55a7052b82ed2c6c34eda
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Mar 16 18:37:55 2016 +0100
Add LHM colors to default palette (#15927)
Change-Id: I081a910284fcc843cb20f7b5be8eedc019cf195d
commit 9f96d39dcfb49d083f235daf112160258496ca78
Merge: 9ebe4a35db00 9fa9a654e0f5
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Feb 26 11:55:44 2016 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit 9fa9a654e0f5a23dc3340547da21dc82777064d7
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Feb 26 11:52:21 2016 +0100
version bump: 4.1.6.22.0+ --> 4.1.6.23.0+ reflects internal LO 4.1.6v3
Change-Id: I9c923020c2fbf640c700a69deafbf6e871d210a0
commit 9ebe4a35db00acae8077cb13f0144511285d8999
Merge: ccb04075faeb 2a9c927254fa
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Feb 22 17:39:14 2016 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all
commit 2a9c927254fab137bdb82ca56c0eb2233e5db42d
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Feb 22 17:25:56 2016 +0100
Extract correct version from base package
libobasis4.1-base-4.1.6.22.0-22-linux-3.12-intel.deb
libobasis4.1-base_4.1.6.22.0-22_i386.deb
Workaround strange "uname -i" behaviour in precise compared to trusty.
Change-Id: Ia72a34f19ac71f4ac985a4d4adfbe49c1b6c69df
commit ccb04075faebbf71d47f8d4d7ee99c4c4e6684c4
Merge: 15edd88b6d96 d6dfcae1e6b7
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Feb 22 13:43:31 2016 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all
commit d6dfcae1e6b7333995791efa5f32e31de3deb3a2
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Feb 22 13:40:41 2016 +0100
Add additional directory to check for JDK_HOME
Home directory has changed in wanderer.
Change-Id: I2233b5fa7c4841c141f74ea81d2b960122a4d847
commit 15edd88b6d96e41f278d0127788043f5bf19ca6a
Merge: aeea86b41073 f9675938c544
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Feb 17 15:26:35 2016 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit f9675938c54470669c80e2cf163ad4ec7f4ff2c8
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Feb 10 14:54:24 2016 +0100
tdf#97526 - in copy/paste ignore unwanted page break on first paragraph
In copy/paste ignore the page break attribute from the first paragraph
of the document (see also tdf#39400)
Reviewed-on: https://gerrit.libreoffice.org/22270
Reviewed-by: Oliver Specht <oliver.specht at cib.de>
Tested-by: Oliver Specht <oliver.specht at cib.de>
(cherry picked from commit b0facbbedf42a02449d9f35bb4ac8bd7ec2d8917)
Conflicts:
sw/source/core/doc/DocumentContentOperationsManager.cxx
Change-Id: I838c21c14647d4692673bd30df320e6704de1455
commit aeea86b41073d8c7b41c405e161b650dc6df4f99
Merge: ff1fda17e886 7961e7a02f44
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Feb 15 09:25:40 2016 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 7961e7a02f446c161dbf9a331f2abbeb1320aba9
Author: David Ostrovsky <david at ostrovsky.org>
Date: Wed Sep 24 02:11:28 2014 +0200
fdo#65281 Empty/Not empty doesn't work in columns with date format
"Empty" and "Not empty" predicates were unconditionally overriden
in filter dialog for date format columns. Rectify it by preventing
the overriding for these functions.
Test Plan:
* open calc document
* define column with date format
* put some data and let some columns empty
* apply standard filter on date column with "Not empty" function
* verify that rows with non empty columns still visible
Change-Id: I2111c5a6b6350cab63173d42419069813d1137b6
Reviewed-on: https://gerrit.libreoffice.org/11613
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
Tested-by: Kohei Yoshida <libreoffice at kohei.us>
(cherry picked from commit 551ee32dfaaddd2aa48efebaefab0730474b656d)
commit f4d3f35d864601b94dc0f37b50b3316b9c8994e3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jun 23 08:26:36 2015 +0200
LinkUpdateMode is a global setting
(cherry picked from commit 77cc71476bae2b3655102e2c29d36af40a393201)
Conflicts:
include/unotools/securityoptions.hxx
sc/source/filter/xml/xmlimprt.cxx
sw/source/core/doc/DocumentLinksAdministrationManager.cxx
sw/source/filter/xml/xmlimp.cxx
Change-Id: Ida1257337c6e0916f2228fe053d9c9f085183af6
commit f4ce5b58fec885d4fd732555345482d46d2633a3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Nov 9 16:24:56 2013 +0100
Converge on SvtSecurityOptions::isTrustedLocation
(cherry picked from commit 16b91e13c726b5b3f43c1aafde6fb8c4c18e3c77)
Conflicts:
unotools/source/config/securityoptions.cxx
xmlsecurity/source/component/documentdigitalsignatures.cxx
Change-Id: Ibcf4b7d9d11295c7679637a37d41dc2960e04f8f
commit 128b987a94e2d78f453d530fa6907f132dd3417f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 8 17:25:45 2013 +0100
Clean up IsSecureURL
...to not use WildCard (in case a trusted location URI already contains an
unescaped "*"), be specific about matching only past a final "/", and rename to
isSecureMacroUri for clarification.
The check with an INET_PROT_NOT_VALID default INetURLObject in
SfxApplication::OpenDocExec_Impl ("we have to check the referer before
executing") had efficiently been dead since its inception in
14237ac4bf497decdde8b742acea23780833ba12 "#90880#: security checks corrected,"
as INET_PROT_NOT_VALID is considered secure regardless of referer anyway.
(cherry picked from commit ea1a7ba72e1bd50a12faff1f8180a5a44745715d)
Conflicts:
include/sfx2/app.hxx
include/unotools/securityoptions.hxx
sfx2/source/appl/appcfg.cxx
sfx2/source/appl/appopen.cxx
unotools/source/config/securityoptions.cxx
Change-Id: I03bca5e6dac89bb2aac52909aff273ea640228d8
commit dd2fe7300e97cdb04ff5122b5ec35ce4dd9ec75a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 13 10:58:06 2015 +0100
convert pStatus to vector and use at to check offsets
(cherry picked from commit ea70088895ed45dc60abf18319acc1b4fa3018dd)
Conflicts:
sw/source/filter/ww8/ww8scan.cxx
sw/source/filter/ww8/ww8scan.hxx
Change-Id: I5186f6a65bb9d5ed8a0d1ab1d71f7e2c13865411
commit 543a8c5a6ad2539abb4ad47b314b0261c9891b87
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jul 13 10:31:30 2015 +0100
ww8: make sure we don't wrap around
Change-Id: I667bb264f92024b72f230c2ddbba3887471345f2
(cherry picked from commit 755b9320c81948358a1d4104c8875594b5700d39)
commit 7f33dc1f783a15ada563d41907405f757fbfc004
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 26 11:26:41 2015 +0000
coverity#1266485 Untrusted value as argument
(cherry picked from commit 0934ed1a40c59c169354b177d7dab4228de66171)
min legal size here is > 4
(cherry picked from commit 3131205c05a3fde4ef1e3322cc48ca23c443f6d3)
(cherry picked from commit 964000d415bcf491704dad57aee7e0656ea60dab)
Reviewed-on: https://gerrit.libreoffice.org/16983
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
(cherry picked from commit 81d1123ac317d9dad9872a9d2feda8cc6bd32492)
Conflicts:
vcl/source/gdi/jobset.cxx
Change-Id: I7708ecaf5412535055584ed6c71beaa9cd71c10c
9f68d000b32623db4d949d13284043630f5689f4
commit ff1fda17e886a9cb535560b278369e1caf4bc077
Merge: 1aed93978cbc 6d18ec7dc756
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Oct 29 10:34:45 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 6d18ec7dc756cf6f14b4945afe75f58c65705f21
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Wed Oct 28 15:00:51 2015 +0100
tdf#92256: Don't save CONV_UNSPECIFIED string ref syntax value
The following scenario is how it breaks:
1. user has ExcelA1 as her formula syntax setting, CONV_UNSPECIFIED
(that means "same as formula syntax") as her string ref syntax setting
2. she saves the document, it will now contain CONV_UNSPECIFIED value
3. someone else with CalcA1 formula syntax setting opens the document
... since it contains CONV_UNSPECIFIED "same as formula syntax" value,
it will use his CalcA1 formula syntax value to evaluate INDIRECT func
=> #REF!
Avoid this by reading formula syntax/grammar value, mapping it to
matching string ref syntax and saving that instead of CONV_UNSPECIFIED
Change-Id: I3cf08878ed8badc8719ee5be535c8fdbb7ba6d42
commit 53ab6304ec3e25e8347fcbbbbe3d77d3fce067eb
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Aug 26 16:30:26 2015 +0000
KDE4: don't ignore write(2) return value
Silence the glibc compile warning and actually handle a wrong
return value.
Change-Id: Icdbc8e655d4b8ad20699dfd0abdbf3405a49f898
(cherry picked from commit e4a3bf0625e4fb608ffdf0fdce67d9d7cabe6822)
commit 07329e9c952153a3c1520507f40ec62a23440a45
Author: Michael Weghorn <m.weghorn at posteo.de>
Date: Tue Oct 27 11:06:22 2015 +0100
tdf#94022 Print dialog: hide Installable Options
Options specified in PPD files can be grouped using the
keywords "OpenGroup" and "CloseGroup".
The keyword "InstallableOptions" is used as a group name
for a group containing options that define
optional hardware features of the printer that can
be present or not (s. section 5.4 in version 4.3 of
the PPD specification).
As they are not print job specific, it is recommended
not to show them in the print dialog.
To be able to distinguish those options, the
PPD group name was added as an attribute to the PPDKey
class.
Reviewed-on: https://gerrit.libreoffice.org/19623
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit f8d0dc09e15b36ae83a5e89280d1f7fbc01da48b)
Conflicts:
include/vcl/ppdparser.hxx
vcl/generic/print/prtsetup.cxx
vcl/unx/generic/printer/ppdparser.cxx
Change-Id: I4a3abf23a711ad98556c0b608a07ef0a91e77e2b
commit 1aed93978cbc277b96c41d6631f744abb9bcc600
Merge: 5d45f271b598 930ae20aa44f
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Oct 16 18:11:00 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 930ae20aa44fa362a1ae95c3f01c5a9885f9e4d5
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Fri Oct 16 16:34:28 2015 +0200
Related tdf#92256: Set legacy mode also for all xls files
Change-Id: I23854ffcd170670f70f5fc386c3b8d35295fa4c3
commit 5d45f271b598f208f41be35f0407f9e14c5ad75a
Merge: 9eb36b6c58dc 780bff41567a
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Oct 16 15:47:56 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all
commit 9eb36b6c58dce13859a6753651929182c96c9863
Merge: 762d41804f55 54760137aa52
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Oct 16 15:36:26 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 780bff41567a3253a8f63e82a9fe16ab3ef238db
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Oct 16 13:55:07 2015 +0200
Enable dbus for linux builds
We have Impress Remote on Windows too.
Change-Id: Iadf77b9e9ef320a9c3ba1b6c8910b1333ac4f719
commit 54760137aa52715eae043f781a0aacd0fd2aeec8
Author: Eike Rathke <erack at redhat.com>
Date: Fri Aug 22 04:29:06 2014 +0200
init formula options once, fdo#82183
Change-Id: I1db4816f4693e35024c6dc6c70585d7b72e68c32
(cherry picked from commit 10b6bda51c9da5429ca562c70ce75ee03e5f4e56)
commit ac9cc408088e1fda251504f15f9d1737d66cb8a2
Author: Eike Rathke <erack at redhat.com>
Date: Thu Aug 21 23:14:52 2014 +0200
fdo#82183 do not reset globals while loading a document
Destroying the function list while an instance of the Formula Wizard is
still open is a bad idea. Workaround not doing this when loading a
document due to a DDE function or external reference being entered in
the wizard.
(cherry picked from commit c0aba5007b6e468336b41138f099914c32f4b0cf)
Conflicts:
sc/source/filter/oox/workbookhelper.cxx
sc/source/ui/app/scmod.cxx
Change-Id: I6fa00fb4f442bf7c9410679e446ff460289e4b16
commit 7f88cd7db10bb7694ff6f39db416a1bdc33b3df7
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Mon Oct 12 15:06:20 2015 +0200
Related tdf#93688: better place this into import finalize phase
Conflicts:
sc/source/filter/xml/xmlimprt.cxx
Change-Id: I08066248973f4560f8f5d149e9f84c4c2302f12c
commit 762d41804f5542a5c8b53afd3f3dac9660fa768b
Merge: 430acebc45b2 76026c5c50c1
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Oct 8 14:34:19 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 76026c5c50c1d24f4ef012985e36170933aac87c
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Sun Mar 9 19:11:40 2014 -0400
fdo#75960: No point instantiating the struct when there are no pivot tables.
Just a tiny micro-optimization.
Change-Id: I850bebc63a3f51456326b09ce72442845ea04478
(cherry picked from commit 98bd1911420f46380aa5373a92de6a748ced080d)
commit 4d4b0b9c57010d4c15073415b577b38ccd6a60d6
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Sun Mar 9 18:40:13 2014 -0400
fdo#75960: Process pivot tables after named ranges are all set.
Especially for those pivot tables that reference named ranges as their
data sources, it's critical that we process them after named ranges are
set. Else things would start to fail.
(cherry picked from commit 057d269c5d1faf45c4c935b2f8120c45e646de65)
Conflicts:
sc/Library_sc.mk
sc/source/filter/xml/xmlimprt.cxx
sc/source/filter/xml/xmlimprt.hxx
Change-Id: I4bf8aa1a844aae3953f2dfbeba0e4d2542a7e53f
commit 8a31fbdbe053f37c2d07085b25a4665e428668d0
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Thu Oct 8 12:55:21 2015 +0200
Related tdf#93688: save CalcA1|ExcelA1 also as a global option
without this patch, it's only possible to save it on per-document
basis
Change-Id: I13359b751ef766c7de53e9e21c299aadbbc0fbf4
commit 430acebc45b24f1669a1da85fe17a9fa7d4ffadd
Merge: c2fa68de6326 9e8fd307401c
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Oct 2 12:01:13 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 9e8fd307401c0835f035b1221f95a0e87d711afd
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Tue Sep 29 15:45:22 2015 +0200
tdf#93688: Set CalcA1|ExcelA1 syntax only for imported docs
those whose string ref syntax is unknown or can't be guessed i.e.
don't use it for new documents (prefer user settings in that case)
Reviewed-on: https://gerrit.libreoffice.org/18923
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
Conflicts:
sc/source/filter/oox/workbookhelper.cxx
sc/source/ui/unoobj/confuno.cxx
Change-Id: I1355031cdd63e2a5c50064531011be71ae7f7b8f
commit c2fa68de632636a30a7b08caebd8af1aceac45fe
Merge: 941cf652b76d ad88a7a3c136
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Oct 1 10:35:37 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit ad88a7a3c136bbc75a19324a2545306f61bf10b5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 10 11:20:12 2014 +0100
Properly encode cmd line for popen
Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
(cherry picked from commit 2b52c8686dcd3fcb95146466e0a8703e8df3cbab)
Conflicts:
shell/source/cmdmail/cmdmailsuppl.cxx
Change-Id: I1f7799920b6732a6cd128143dfa7ce282bad25c6
commit 66adc7dbb2cc74087b30f23340620feebfff7c39
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Sep 15 15:34:42 2015 +0200
Update hwpfilter to current master
This patch is based on a all changes up to
42e379a542bb756df1d2a61876db61f2f5c229ec clang-tidy clang-analyzer-deadcode.DeadStores
All 157 patches were merged and a small subset was reverted to undo upstream API change:
5684fbce646bfd6514e7857a9e79c02a89c5346d add hwp to fftester
370a26f7804d12da26abe007f1d80a00c4fdaeb4 hwpfilter: tdf#88206 replace cppu::WeakImplHelper*
48bb2913a7459edb17a5f62c2f6e6fbc4f1051e2 convert SFX_FILTER_ constants to enum class
fb14be5f8f74f83ba89e15f891ddf1f753dcc62f create new 'enum class' SotClipboardFormatId to unify types
369d95931f42267eb2f55e066f58ee859183025d DeInitVCL at end of tests
70cc2b191b95fbc210bc1f0f6a7159f341894f0f First batch of adding SAL_OVERRRIDE to overriding function declarations
5e21a413c788f839a66d9e4c14e745ed18058db8 cppuhelper: retrofit std::exception into overriding exception specs
9ed364774c6e26e14409bd927e03e6da7fe01b60 Adapt all (non-extension, SharedLibrary) .components to environment="..."
24cad6a6490b245bd88ec3e3c87195628914f6a2 Move MediaDescriptor from comphelper to unotools
There were so many bug fixes found by diverse tools, that this merged
approach seemed more correct, then trying to fix a specific error.
Oh - and if you wonder about the Korean comments in the codebase:
https://en.wikipedia.org/wiki/Hangul_%28word_processor%29
Change-Id: I719ff1a5fc4d09f1469354941aa32e27787e2781
commit 64c5bebca267ed8dc45f03efdde954c3070d0bac
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Tue Oct 7 10:10:27 2014 +0100
Disable sdremote by default, and improve flow control.
It was intended to disable sdremote by default when it exited
experimental mode.
This reverts commit 576943b9bf7506829de97d2194c4bee35a485436.
Reviewed-on: https://gerrit.libreoffice.org/11837
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
(cherry picked from commit 99023fe9bd7d8b665faed7fe9cb98b3fb8922292)
Reviewed-on: https://gerrit.libreoffice.org/11839
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Reviewed-by: Andrzej Hunt <andrzej.hunt at collabora.com>
(cherry picked from commit a7a890509c91e79dc330c2fbf1df97f0c6b08c92)
Change-Id: I2c1b5443e334021bd9574316167f48b1af6200e5
commit c9d3933edb02dc528c0b2cb0a05e7da8ac763404
Author: Herbert Dürr <hdu at apache.org>
Date: Mon Jul 14 07:17:59 2014 +0000
Related: #i125226# expect DDE servers to be already up
"soffice" is always up anyway and other DDE apps should be started manually
(cherry picked from commit e0bfdb26cef87c8d3b3435293116a33cf99c11f0)
Conflicts:
sfx2/source/appl/impldde.cxx
(cherry picked from commit f4a8d7cd10cda57143b22519e16cdf8d5f19e759)
Conflicts:
sfx2/source/appl/impldde.cxx
Reviewed-on: https://gerrit.libreoffice.org/10297
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
(cherry picked from commit 1e7502f3c8b8d751dd851c3f146debf2678781ec)
(cherry picked from commit b92da9e9f3125ef186a29a9644c4197c25c1a521)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I52ebb26528952a4abf33ac95cb67c598f08b2790
commit 8a9e9aa939cb464e3e9cb7865e34188e28bd85e6
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Jul 9 15:23:59 2014 +0000
Related: #i125226# don't try to access known-bad DDE servers
(cherry picked from commit 88de6a59d9d7933b86fdcba733277aa4fbd5e132)
Conflicts:
sfx2/source/appl/impldde.cxx
(cherry picked from commit b16f164650f8345e51bf0b0c73bf9c8eee775bc2)
Related: #i125226# some macro preferences are directly...
applicable to DDE servers
(cherry picked from commit 2c835e761e1e9ddb6794895e6f3538b918160dd1)
Conflicts:
sfx2/source/appl/impldde.cxx
Related: #i125226# typo fix
(cherry picked from commit 727ea069c6342e01a50c8b068ec302574b251cbd)
Conflicts:
sfx2/source/appl/impldde.cxx
(cherry picked from commit 13b68e24db26374ca17572de9abb429edeac32e9)
Related: #i125226# disallow absolute and relative paths for DDE servers
(cherry picked from commit 6b64ada6e3a902ac4b44fe49476514d49138d4d4)
Conflicts:
sfx2/source/appl/impldde.cxx
(cherry picked from commit d1fc47793c1efbe9ff5271656283211647dd0b33)
Reviewed-on: https://gerrit.libreoffice.org/10202
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
(cherry picked from commit 3d1cb5397d95bba5426ac5372bbd7644aac88409)
Change-Id: If4dcd49cfe15188d06e4e06cd8e58cdcc66ed5a4
c16b3df34ac1b003a8a5cabab15ea655d05bdd18
8db53b7e8529d05e660a2d69e669b44c9045712c
127add375a127dbbd0eaf12a10884e2636f1a332
commit 7355b0089f1f92ad808b0cb29f00c9b9c92dd0a5
Author: Armin Le Grand <alg at apache.org>
Date: Thu Aug 7 09:59:26 2014 +0000
Resolves: #i125386# secured user request and changed some bools to bitfield
(cherry picked from commit 5e3cbe056c19bea5018dbf1fd4b2bc8f8b030ff3)
Conflicts:
comphelper/inc/comphelper/embeddedobjectcontainer.hxx
comphelper/source/container/embeddedobjectcontainer.cxx
sfx2/source/appl/linkmgr2.cxx
svtools/source/misc/embedhlp.cxx
(cherry picked from commit d005acae3aa315921f2c331612131626c470bd22)
Conflicts:
include/comphelper/embeddedobjectcontainer.hxx
Reviewed-on: https://gerrit.libreoffice.org/10882
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
(cherry picked from commit 070f5923eac7a93b64d2f168d91a3983b80a22c0)
(cherry picked from commit 8b78c7a2b25ee81104226fa7ed46798f9ebe091f)
Conflicts:
svtools/source/misc/embedhlp.cxx
Change-Id: I7e9b20a87ca6afe8cb91c577860a6c6b72368ee9
commit d3cd62d4ccf81a0f133f90261047b6ee73b8eba4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue May 20 14:55:40 2014 +0200
Use varying aElement name
(cherry picked from commit c4fc6ae7e4b1e10c805c057564ccd4753249fce0)
Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4
commit 150a5cecab6ed931f0d5cc7a4f626ed4ee1d29e1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Feb 10 11:18:33 2014 +0100
Resolves: rhbz#1063170 Don't URI-encode filename in e-mail subject
Change-Id: I7e3f59af5bb7d89c74e2bf199a727b2419714121
(cherry picked from commit 740fe0ce142c521d3a75558dea6535017821e127)
commit 941cf652b76dfb57514cb74546d60d4cabdd3b57
Merge: 189d3f1138ed a0ece3d80347
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Sep 4 09:30:22 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit a0ece3d803472a1a962dde6fb704d2a42ef31061
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Thu Sep 3 15:18:58 2015 +0200
tdf#93246: pass on cancel state in mail merge dialog
trac#16167
The return result was not used for the CUPS case before, leading to
un-cancelled printing / document generation in the file->print
mail merge case.
Reviewed-on: https://gerrit.libreoffice.org/18302
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 88890c2a7522394f355a3f47a4dfb4608ac5a1cd)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
Change-Id: I470293755c6696fca6d1b97fa1dac7854b4f7107
commit 189d3f1138edf60b185bd46f3cc65624de46273c
Merge: 670cbd4fe185 6904d33a9457
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Tue Sep 1 15:11:26 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 6904d33a945722781bf925a349b3841b70206f45
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Tue Sep 1 11:03:46 2015 +0200
tdf#93052 - When save, generate unused list-styles in context.xml
trac15956 LO Calc Bedingte Formatierungen (Fehler Teil 2)
First Patch do not solved the problem
The evaluation of the 0 is here
http://opengrok.libreoffice.org/xref/core/xmloff/source/text/txtparae.cxx#615
and this methode "xNumRule->getCount()" get back the 0.
Reviewed-on: https://gerrit.libreoffice.org/18228
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit d9305ae68bf3707242a96fb1b697c36d6eaf91c4)
Conflicts:
editeng/source/editeng/eerdll.cxx
Change-Id: I2a8f53199b0819f36a7d3e1887c75089143b29a9
commit 670cbd4fe1858d2255d981476401ecbd6adda5bb
Merge: f00154826af3 01b2bbbdb5c2
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Tue Aug 25 08:14:43 2015 +0200
Merge remote-tracking branch 'lhm/private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 01b2bbbdb5c2bfc8c4760b248e3c16bd216b3fa9
Author: Vasily Melenchuk <vasily.melenchuk at cib.de>
Date: Thu Aug 20 15:48:04 2015 +0200
tdf#92324 Fixed MailMerge printing with values from database
Locking of ExpFields is required to lock current state of fields and database cursor:
generation of print preview and some other operations can cause changing
of current database record, especially if document contains nextrecord fields.
Reviewed-on: https://gerrit.libreoffice.org/17857
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 959a5043ccb4bb027e0149a56d31ebb78d5eb862)
Conflicts:
sw/inc/editsh.hxx
sw/source/core/edit/edfld.cxx
sw/source/uibase/dbui/dbmgr.cxx
Change-Id: If0466ef2489d96264380b5978ef7d7cf3f545c23
commit 95c340cf1a52b55aa40ac0ed97f02b4bcd5c23b0
Merge: 14910a42d126 9531d6f899cd
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Thu Aug 20 14:33:37 2015 +0200
Merge branch 'private/bubli/lhm-4-1-6-backports' into private/jmux/libreoffice-4-1-6+backports
commit f00154826af373d92848233289ce1e3f6e76d316
Merge: acab90404f7b 14910a42d126
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Fri Aug 14 14:54:47 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit acab90404f7bffdeef6b55a7a57cd25c39b965c0
Merge: 020e1590d483 61a4fa6754c1
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Fri Aug 14 14:54:36 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit 14910a42d126e0c08f7cfaa4ce94d33bed3126c3
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Tue Jul 7 12:08:33 2015 +0200
Related tdf#91362: disable paper size & orientation selection
Unless 'Use only papersize from printer prefs' is toggled on,
whatever the user sets here doesn't have any effect on the actual
printing (page settings from the document are used instead). It is
misleading to have the user believe otherwise.
It was really challenging to have this one toggle get all the way
down through several layers of abstraction, though ...
Change-Id: If240084ca23b3946a92882a6ee47dbc161b3b86c
Reviewed-on: https://gerrit.libreoffice.org/16812
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 2a1fe443a8343642292444be19cbd10700e7e01c)
Conflicts:
include/vcl/print.hxx
include/vcl/printerinfomanager.hxx
vcl/generic/print/prtsetup.cxx
vcl/inc/jobset.h
vcl/source/gdi/print.cxx
vcl/source/gdi/print3.cxx
commit bb33747a1769c598f10d00d02a015c3757244cfe
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Thu Jul 2 15:34:11 2015 +0200
tdf#91362: Make "printer was modified" status persistent
To test:
Scenario 1:
* go to Writer -> Format -> Page
* select page format and orientation, if possible a different one than the default
in your env.
* File -> Print -> Properties should now show those values (and not the default
values from the printer)
Scenario 2 (aka Scenario 2 from tdf#61186)
* now go to File -> Printer settings
* change page format and orientation, if possible to yet a different one than the
printer default and a page one
* File -> Print -> Properties should now show what was selected in Printer settings
and not the format of the page
Change-Id: Ibc84540f428b79dbec2587c50eefe526a62751b3
Reviewed-on: https://gerrit.libreoffice.org/16716
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 0251e61640b94094918406b33ee7b05564409feb)
Conflicts:
include/sfx2/viewsh.hxx
sfx2/source/view/viewprn.cxx
sfx2/source/view/viewsh.cxx
vcl/generic/print/prtsetup.cxx
vcl/source/gdi/print3.cxx
commit 8775f656ff60e2685147272d33799d8664fac72a
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Wed Jun 24 17:31:32 2015 +0200
tdf#91362: Don't override printer page autodetection
if printer settings haven't been modified
Reviewed-on: https://gerrit.libreoffice.org/16454
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 07602e5a8b869be1c45158cf71d6015d17a5f797)
Conflicts:
include/vcl/print.hxx
vcl/generic/print/prtsetup.cxx
vcl/generic/print/prtsetup.hxx
Change-Id: I68b0096ce6fa0f9e50db640a0acb3039ff7e66b5
commit 61a4fa6754c1f9607bfb3616e8747602fd755586
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Fri Aug 14 08:56:07 2015 +0200
Revert "Patch von Lanedo für #11826 integriert."
This reverts commit cf644323043d5439b350371965d5cdffb82c9bf7.
in tdf91362 there's a better solution implemented
commit edb2f7751e6172424caf2ed6422181bee6d59e1b
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Thu Aug 13 10:00:43 2015 +0200
Revert "Auswahl von Papiergröße und -orientierung deaktiviert (Trac #11826)"
This reverts commit 22a99b059a0d7655e74b65441c706102be8d6896.
This patch has caused trac#15629 and there's a better solution
in master. So we revert this patch.
commit c55cd2ed57b419536355c738a231136e0db97677
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Thu Aug 13 09:59:12 2015 +0200
Revert "Handle fixed page size printer option."
This reverts commit b002226b5c9a970960de39be535e97e861860866.
It didn't solve the basic problem. There's now a better solution in master
that we want to cherry-pick here.
commit 020e1590d4837ca1044ecc37318300754bb8ebef
Merge: f7b619b9157b 55bbc5883a05
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Aug 4 14:48:21 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 55bbc5883a05e51bbedc5740d0bf58d064e5423a
Author: Henry Castro <hcastro at collabora.com>
Date: Fri Apr 24 16:55:01 2015 -0400
Resolves tdf#67712 form controls and draw objects
anchored to cell but changes position after reopening
Also included tdf#68797 "FILEOPEN lost position of lines
anchored to cell". It was marked as duplicate but the
step to reproduce are different.
Conflicts:
sc/qa/unit/subsequent_filters-test.cxx
Conflicts:
sc/qa/unit/subsequent_export-test.cxx
Reviewed-on: https://gerrit.libreoffice.org/15523
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
(cherry picked from commit 487880b6882ec01c1b4679eae60bec484272a86b)
Conflicts:
sc/qa/unit/subsequent_export-test.cxx
(cherry picked from commit b1f1c77687e301c99e81631d33298e44bdb5ca84)
Conflicts:
svx/source/svdraw/svdoashp.cxx
Change-Id: Ia1c4010f118749256077a0ecad6ca16b867d22f7
commit f7b619b9157b1dc7c892481e26925662a09f71ff
Merge: fe77e6c5b9a6 1cee96a08f73
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Tue Jul 14 10:29:40 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 1cee96a08f73f31d25d61e432e2c8867c4e61b8a
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Aug 11 22:24:54 2014 +0200
fdo#81995: fix Outline numbering tab page
The "ParentNumbering" property is not a string.
(regression from 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53)
Change-Id: Ib33e95847b388bb1126a63812e128c96a0c00730
(cherry picked from commit 4d3c9ed257e51af55f358d2b44d5fc2e341c7202)
commit fe77e6c5b9a6ce7ec1da5e92c3095473349148a5
Merge: d61e16a16aba 04209b2396aa
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Jul 3 11:19:07 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 04209b2396aa142d79e945dace7e70fd9e112d32
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Jul 3 08:33:03 2015 +0200
tdf#92517 KDE4-FileDialog: "Save as" has wrong Filter
Fixing follow
- The order of calling: first should be set the filter, after
that can be set the current filter
- change the function from "setCurrentFilter" to "setCurrentItem"
When you set the filter over "setCurrentFilter" you need the full
search string "extention|description" e.g. "*.docx|Microsoft Word.."
- Not need the escape of slash (with that can not find
"Microsoft Word 2007/2010 XML (.docx))"
Change-Id: Ie4f7d6fd619b391487ee944c3e745c855600ee54
commit d61e16a16aba98c78854bfcdc166b51a3013f11f
Merge: 64c66ca6c511 e1d9c313b2cd
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Jul 3 11:01:00 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit e1d9c313b2cdf631341b0867cc72fd18d746ea20
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Jul 3 10:51:31 2015 +0200
version bump: 4.1.6.21.0+ --> 4.1.6.22.0+ reflects internal LO 4.1.6.22
Change-Id: I58145787535077d45d7cf6ddb346bf7c906bed12
commit 64c66ca6c511d9c8c5f1c65a9e6e8e36e8f7ad60
Merge: 696c1da83957 756babffdc6a
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Tue Jun 30 10:58:11 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 756babffdc6ab06de15b71c1606392d344e1f64e
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Jun 26 15:45:00 2015 +0200
tdf#92353 FileSave: Not confirmed for overwrite a file (unix)
trac#15655 LibreOffice 4.1.6 ver2: keine Warnung für das
Überschreiben bei PDF-Export
The overwrite was not only for PDF-Export
The setConfimOverwrite function must be set after
setOperationMode function
Reviewed-on: https://gerrit.libreoffice.org/16517
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
(cherry picked from commit 3e8c14df67a43d3088ed7df0a2b0d96a4bc42d57)
Conflicts:
vcl/unx/kde4/KDE4FilePicker.cxx
Change-Id: Id5ab54be502e9c96eba3d7ab600b5e06e241c8fd
commit 696c1da83957310d449941d827a0515c57cadef2
Merge: f39f75bcf698 d20dcf4af85a
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Mon Jun 29 18:29:58 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit d20dcf4af85a852a1bdae72b78d63b217a399bf7
Author: Eike Rathke <erack at redhat.com>
Date: Thu Jul 3 00:08:51 2014 +0200
work around nonsense -Werror=maybe-uninitialized, fdo#80166 follow-up
Change-Id: I0f9cf74550e43d174bf6ac75e70c51ab7f51ccf8
(cherry picked from commit 397362d8532d7b0abe38f2024dd2cefe2482d6a3)
commit 8ec1753f7e7e4c79194548c0a82d704609866194
Author: Eike Rathke <erack at redhat.com>
Date: Wed Jul 2 22:24:52 2014 +0200
resolved fdo#80166 check input against date acceptance pattern plausibility
... to prevent confusion of #.### input with D.M that then later is
discarded as invalid date input instead of accepted as valid numeric
input.
Change-Id: I178e28b7ef3b26d04eecc73e5e5c61ee41f89e32
(cherry picked from commit 836e504c859a5b67f7ab7ba842785951d41058cd)
commit f39f75bcf698db7c37bf986da5ef61b8b093309b
Merge: 001f3815136b 0c36e15e21e3
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Thu Jun 25 15:04:35 2015 +0000
Merge branch 'private/juergen/Linker-Fehler' into private/jmux/libreoffice-4-1-6+all
commit 0c36e15e21e3b79efba1343ce97d22a0060c18d5
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Thu Jun 25 15:24:02 2015 +0200
Compiler-Linker-Fix for Windows-Debug
the fixes are only active when Windows-Debug is active
Compiler-Fix (docary.hxx, docfmt.cxx)
The compiler want see the this parameters (look to diff)
But it is not needed, only for compiler??
Linker-Fix (ww8par.cxx)
the linker see two vector::sizes,
solved to change to std::list
Change-Id: I3d9e066765f141350da360527669306d30b02999
commit 001f3815136b2e31c44928dfe137a89296fb2ef6
Merge: dc393d333693 a76eb596a269
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Thu Jun 25 11:08:06 2015 +0000
Merge remote-tracking branch 'lhm/private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit a76eb596a26944300b25fe4db6f963a56d8253b2
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Thu Jun 25 11:20:27 2015 +0200
trac#15707 LO Writer: Eingabefelder in geschützten Bereichen
Felder werden in geschützen Bereichen übersprungen, allerdings wenn
ein Refresh erfogt sollte dieser ignoriert werden.
Es existiert hier ein Flag (bInReadOnly), dass nur dafür gesetzt wird.
Change-Id: I7b506d34fc903c644ef36e5bef775e45daacfa50
commit dc393d333693cc0b7e1dfe802e34a45ac4fb5108
Merge: 2b56a4f902db d83df2927757
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Wed Jun 24 17:28:39 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all
commit d83df2927757ca5c73d4af9edfeb306ca7701887
Author: Christoph Lutz <Christoph.Lutz at cib.de>
Date: Wed Jun 24 13:31:43 2015 +0200
Changed path of WiLangId.vbs which is needed for packaging
The old path was not found on a windows system with a fresh vs2012
installation, while the new path seems to be available on all
current build systems (in particular on kvm-win7build)
This patch doesn't need to be put upstream (5.0 or master), because
it should be already solved there (there's now an own environment
variable for the path to WiLangId.vbs)
Change-Id: Id0db9a3b6354962c5ff22c4a51507788934eab21
commit 2b56a4f902db96035a43526cb332b7572396e77a
Merge: 9027ac4a4d23 c996185695a9
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Mon Jun 1 16:28:36 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit c996185695a90362cecf08a851db9d2ff0fb02fe
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Mon Jun 1 15:28:22 2015 +0200
Set the new copyright 2015
mit den translations
Change-Id: Ic588e592a6bf07d12e166a04a1008c80527d977f
commit 9027ac4a4d236b11f731d525b11305da10f44aa7
Merge: f3b8c1aa688c d45fafab7b19
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Mon Jun 1 09:33:08 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit d45fafab7b19e3c17a035b6ccc0bf6fb74326c17
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Mon Jun 1 09:24:48 2015 +0200
version bump: 4.1.6.20.0+ --> 4.1.6.21.0+ reflects internal LO 4.1v2
the second 4.1v2 version, after printer trouble
Change-Id: I433597030aae152e4099e7d1236269f08d91da0b
commit f3b8c1aa688cc0e5b5a7f7dc494b26d43e14f4e0
Merge: 2e0110742131 7cefed62eb57
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Mon Jun 1 08:27:05 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 7cefed62eb574acaabe942e4aa91efbf6ee5009e
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri May 29 15:22:04 2015 +0200
tdf#91720 -after MailMerge print, plain std print is not possible
Reset the batchmode variable, after the batch print job
Related: 138d29aa09417eba4d15ade4c9f4dab2620b6326
Change-Id: I6d8861e53ba6245019213d88d83603bfe932f010
(cherry picked from commit 1950ad547462fface018aafe7b65d5ceb445648a)
commit 476dbe13abf2e1970cc1dee969a6194bc5954d62
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri May 29 11:01:52 2015 +0200
cancel doesn't cancel printing, assert on attempt to print after cancel
can not cherry-pick from
7847a338f13071dcd591617f0e8d8fd69b2b0818 and
e5ce36800b1669da08ab6440bc2f8bc2bd305ded
made a distinction it is too big
regression from 7a6f4af8b8b56c8b07f689dfa5c01e92a5a71b55
support fast MM printing in non-single-file mode only for CUPS
Change-Id: Iae9ccf457b8cabca469f5fb31c0810fbd3797a02
commit 37024892a16ccf3a3e4464fafafb7a85823a3507
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Mar 19 17:06:59 2015 +0100
CID 1288898: Uninitialized member
Change-Id: I1523ba22d419a12ae60de4f7afd293fe6cbfb6b5
(cherry picked from commit 2250caf30d5e9fb297e97952a2bc061856701563)
commit 2e0110742131322e488365e3d741fe01c5d73ec2
Merge: 2109b726d8ac 01b8cba7f44a
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Fri May 8 12:26:41 2015 +0000
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit 01b8cba7f44acc6c3944873422b51dc2747bda0d
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Fri May 8 11:56:25 2015 +0000
removed webdav from X-KDE-Protocols lines
Webdav was included in the set of supported protocols since those X-KDE-Protocol
lines got introduced with 673be8e76856c6bc39f448f3374db4ae84258952 "add
X-KDE-Protocols," but doesn't work as expected:
calling "soffice webdav:<path>" just shows the splash screen and doesn't open
the document behind <path>. It works if vnd.sun.star.webdav:<path> is prefixed.
Since our kde integration also works well without webdav in the X-KDE-Protocols,
it is better to remove it from the list.
commit 2109b726d8ac3c84286da2304f47fa0cf0a57724
Merge: 9267259500fd 5c5de2014e5c
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Tue May 5 16:13:52 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 5c5de2014e5c04e2a87f6c0aaa03837f106ec79d
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Mon May 19 19:48:35 2014 +0200
fdo#77891 fix python crash when in GUI mode, target WinXP with VS2012
VS2012 did change return value of fileno function, this results in a
crash when run in GUI mode (but not when launching from a shell), as
python tries to access the nonexisting stdin/stdout/stderr
Also explicitly target Windows XP
Change-Id: Ic783713b55453f3c38b2e766a664b7f4678711de
(cherry picked from commit e175eb3cedded28909247f4d46f2c17ff2f58be2
and adjusted by Christoph Lutz: removed Win XP stuff and kept only
python 3.3.3 msvcr-fix)
(cherry picked from commit 0d36acd453ec1551f7d2a6d91b65dd5bdeea7d30)
commit 9267259500fd82caef2737505c6d850306c7e528
Merge: e2febd671f03 17e0a749fb7a
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Mon May 4 12:30:38 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 17e0a749fb7ade14144af4af0a71f56fd4b45626
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Thu May 22 15:51:54 2014 +0200
using xargs for string manipulation is somewhat of an abuse
(and breaks the build on windows/cygwin for some reason, although
running the find/xargs command by itself works just fine)
So just use awk instead and have a nicer solution without breaking the
build
Change-Id: I24b9f52c0b84c2e8019f3f6719a307fe508fb755
(cherry picked from commit faa9a681e730e5028c5fefa90938726ff9abe31d)
commit e2febd671f03931a7ae061cd1438292a47b5a876
Merge: 856d7e769044 3a5f16123735
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Thu Apr 30 10:30:05 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all
commit 3a5f16123735629a34e50144166d6108c462ec47
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Thu Apr 30 10:29:05 2015 +0200
Nummernschema mit Patch-Nummer >9: 4.1.6.?.? --> 4.1.6.*.?
commit 856d7e769044df98a11e7ba582a59eafa8af9050
Merge: 87b92e3b27a8 2abb9384c8b9
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Wed Apr 29 17:47:22 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit 2abb9384c8b90891711e7eed119ec57d7799f7b9
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Wed Apr 29 17:20:32 2015 +0200
version bump: 4.1.6.2.0+ --> 4.1.6.20.0+, reflects internal LO 4.1v2
commit 87b92e3b27a83a5c626d98390384b9885f897e0b
Merge: f9ce77c9c660 89f57f689717
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Tue Apr 28 16:33:11 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 89f57f689717d271fed12daec3418bd8118af023
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Tue Apr 28 14:12:39 2015 +0200
Fix tdf#90911 wrong parameter size on getsockname
This was crashing on selected versions for Windows.
Change-Id: I7e9dd39db06f6ed93d2ae0d49275387e53983a89
Reviewed-on: https://gerrit.libreoffice.org/15559
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 84c73c983577e33dda266bbfcdd89b9e1202906b)
commit f9ce77c9c66031baeacc98f3cfb93ecd6ba3e62d
Merge: 1391b3907fbd 9195a93d9621
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Mon Apr 27 15:10:23 2015 +0000
Merge branch 'private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all
commit 9195a93d9621697c447e68db8e5fd40fc84530e1
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Mon Apr 27 16:17:02 2015 +0200
--with-jdk-home im Windows-Build nicht zweimal setzen
commit dfed514c3ff355c449c84830a27c98abde18c573
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Mon Apr 27 16:06:32 2015 +0200
starte Release-Build (wie früher mit -w) + neuer Schalter -s für Symbols build
- -r Release Build (ohne -b) --> da jetzt Standard
+ -s Release Build mit Symbolen (ohne -b) --> neu
- -w Windows-Build
+ -w Windows-Build (Standard ist Release-Build, außer -b, -s, -u oder -d sind angegeben)
commit 1391b3907fbd9d0eb55989d90a1b431e92ebe432
Merge: d717729446c6 9433bec90bbb
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Tue Apr 21 15:10:40 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit d717729446c62bdf6d346242cb9b5af78eaa42e2
Merge: 1406b90eabdc 8cbb22de9c68
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Tue Apr 21 15:10:10 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all
commit 8cbb22de9c68804324860c58ccbb7fc6c9d108b8
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Mon Apr 20 16:26:13 2015 +0200
Build script erweitert um Debug über Jenkins zu realisieren
Achtung ein Parameter "d" wurde in "i" umgeändert
Neu Paramerter sind
-r => Release Version
-u => DbgUtil Version
-d => Debug Version
Change-Id: Ib5dbbbb4c51e15c2ff885cd8ca0904bf5c13a16f
commit 9433bec90bbb1137723c6681bb99bec70ae3a4aa
Author: Eilidh McAdam <eilidh.mcadam at itomig.de>
Date: Wed Mar 18 01:33:43 2015 +0000
tdf#78606: Write DOCX header even if section is first paragraph
Header flags are now set prior to export if a section is the first
thing in the document (ODF -> DOCX).
Change-Id: I84ba61c11da78a012938163d986ee5fcd301d405
commit 31b9cde41885bb3133b0cfd19db3d8646d0c4415
Author: Eilidh McAdam <eilidh.mcadam at itomig.de>
Date: Wed Mar 18 02:00:28 2015 +0000
tdf#60060: DOCX export of section protection
Initial implementation - no password protection is saved.
Specific sections are protected in OOXML by using form protection;
that is, only form elements may be edited in protected sections.
Change-Id: I294064bbc4e3c307d17001ebd21f1bd6f07de42c
Reviewed-on: https://gerrit.libreoffice.org/14895
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
commit 1406b90eabdc43b9d75079becef97ba831a31ea0
Merge: acdf8bf6cddf d6b7fe98ba6f
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Apr 15 13:29:35 2015 +0200
Merge remote-tracking branch 'lhm/private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all
commit acdf8bf6cddfbaead897bd9f71ae232da193c659
Merge: 8f27773fba81 9fcee3c6246e
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Apr 15 10:45:10 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
to tdf#90230
the new "for loop" is not possible with gcc 4.6, change to the normal "for loop"
commit 9fcee3c6246e8658408b9a6bbd280d1f12c183a3
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Wed Apr 15 10:25:06 2015 +0200
tdf#90230 SwDoc:: AppendDoc: take care of marks when inserting page break
the new for loop is not posible with gcc 4.6, change to normal for loop
Change-Id: I36b66640bf0f2d8ba0d6d19b23313c51a1b978fb
commit d6b7fe98ba6fd22eea26e2f359458d8098f484cb
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Tue Apr 14 16:38:11 2015 +0200
Skript zur Bestimmung der Unterschiede zwischen LO4.1v1 und LO4.1v2
ich habe es wie folgt genutzt:
./fuzzyDiffGitBranches.pl libreoffice-4-1-6+all_v1 lhm/private/jmux/libreoffice-4-1-6+all >diff_V1_V2
commit 8f27773fba818caeff412725870ebfa71d0f621b
Merge: 0697239bca3d f38890cf1386
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Apr 10 16:26:52 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
Merge from private/kendy/condformat-fdo82014 (last 5 commits)
commit f38890cf1386256e466a0f4dc0399e93dacd96c4
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Apr 10 15:48:31 2015 +0200
fdo#82014: Repaint & set the document to modified after condformat change.
Change-Id: Ife3e805b95bede7be5d436abab925b35e717ee5e
commit a1287205d91999acce1aefc1fd5dcc4b12c07991
Author: László Németh <laszlo.nemeth at collabora.com>
Date: Thu Apr 9 10:46:03 2015 +0200
conditional formatting: Follow-up rebase fixes.
Change-Id: I1cce7e3052bf9e989b83ce73364c1a7b1928feac
commit 60c08f5bd789fee9d92d17d016350c6710660af3
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Sat Nov 9 06:06:48 2013 +0100
Calc UNO API test
Change-Id: I6dcd9ac05ff7c4a6fbae7947b0ceda8797feea2f
commit c2dba1ef4d1f068ac31a5f2b58aa45bd972b8fb1
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Mon Dec 22 14:09:25 2014 +0100
UNO API test for conditional formats
Change-Id: I45d4b9652f35174eaf59c8868d593764c2ef2ebf
commit a5b2d53fcf71b3eaa364df03f0f337524ddf1d64
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Tue Dec 23 20:39:53 2014 +0100
fdo#82014: Remove old conditional formats when setting new one by UNO API
Conflicts:
sc/source/ui/unoobj/cellsuno.cxx
Change-Id: I76488045eba281227124041da505e38c4c3d31c1
commit 0697239bca3d977250571b2224d805b558488b6e
Merge: 32fbf5475594 c805ab77518f
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date: Fri Apr 10 16:15:19 2015 +0200
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
Merge private/kendy/mailmerge-05 (last commit and BuildFix)
commit c805ab77518fda23e5b8bb56a7cc15117ef0f866
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 10 11:54:03 2015 +0200
tdf#90230 SwDoc::AppendDoc: take care of marks when inserting page break
SwDoc::AppendDoc() inserts nodes from an other document, and before
doing that, it inserts a page break at the end of the document. In case
there are marks at the end of the last paragraph, the insertion of the
page break moves them to the next page. This is a rare situation, but
happens e.g. when the source document is an empty one: then MM puts a
mark at the first paragraph of each inserted MM part, and then the first
paragraph == the last paragraph, so the mark of the only paragraph in
the document gets moved to the next page.
This is a problem on its own, but is detected by the SwIndexReg dtor
when that empty paragraph gets deleted later in SwNodes::Delete() called
by SwDoc::AppendDoc(), resulting in an assertion failure.
Triggered by commit a305a2c91420652db450b7f8edd140e1d69f42cf (use
bookmarks to mark mailmerge parts in a mailmerge document (fdo#80823),
2014-10-20), these not adjusted bookmarks were not detected before.
Unit test not included, as the entire mailmerge unit test framework is missing
in 4.1.
Conflicts:
sw/qa/extras/mailmerge/mailmerge.cxx
Change-Id: I89775b477a2fd3182b2bc87144aed2bfe7912aff
commit 6a91e8e7297ac09ff1ab4d1a8352cc8616430461
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Apr 9 19:09:07 2015 +0200
Buildfix for the backport.
Change-Id: Ia88e3ecbacca6358e7c07b7a415293f57ebf30d7
commit 32fbf5475594c22005f2e39d1f03e16def4d038b
Merge: ae4406f7c5fd 0da561509c5f
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Wed Apr 8 17:08:32 2015 +0000
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 0da561509c5fd5f359e7e0694cdf644b5cbb592e
Author: Christoph Lutz <christoph.lutz_ml at cib.de>
Date: Wed Apr 8 14:57:28 2015 +0000
MM: fixed invalid UNO-Reference as return value of UNO MailMergeService
This fix is regarding 9835bb562 "MM: export the SwDocShell mail merge via UNO":
In case of using the new output type MailMergeType.SHELL, the UNO
MailMergeService returned a XTextDocument instance that was not
correctly initialized. In particular after calling doc.getCurrentController()
(with doc = the returned instance) we recieved NULL. The reason was, that the
previous implementation used to create a new SwXTextDocument instance
instead of just returning the BaseModel that is already associated with
the internal SwDocShell. This is fixed in this patch.
I also tested this patch with the unit test sw/CppunitTest_sw_mailmerge
and everything seems to be fine now. doc.getCurrentController() no longer
returns NULL.
Change-Id: Ic116f8f25ab9686ef56950e97ba202a55ab81fb8
Reviewed-on: https://gerrit.libreoffice.org/15207
Tested-by: Michael Stahl <mstahl at redhat.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 098d08d6af951afa4f20f6f7883f6c9d34e87e11)
Conflicts:
sw/source/uibase/uno/unomailmerge.cxx
commit ae4406f7c5fdebfbee49e2bba1c4b321f140dbb9
Merge: 3c394300cffe 743966cdf34a
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Mar 25 14:18:57 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 3c394300cffe07a850e41047edf374d6fcc5bb65
Merge: 1880810b68a8 6a568ab6c711
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Feb 23 14:37:31 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 1880810b68a872476f3c63eb9563e7b9a7dc0c0a
Merge: 1c40ae183a89 75055ee27ffb
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Feb 18 18:36:59 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 1c40ae183a895325b7e9473efdac83f4c62ef00d
Merge: 9d31c1e5857e 7bdab66a4b41
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Feb 17 11:26:25 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all
commit 7bdab66a4b413a586c9780248687ea213f88c0aa
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Feb 17 11:25:23 2015 +0100
Update translations
Change-Id: Ie34c9be2159ae64e18776a27de8e2f791e51d1d3
commit 9d31c1e5857ebdf56da328be4af954237a702c9d
Merge: 6a34fb0fa12d a0fbb74fdecc
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Feb 17 11:02:48 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 6a34fb0fa12dcbe7dcc71bb973637a25a638c3b5
Merge: c92aa542a0a5 b30fb9593b5e
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Feb 16 13:07:15 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit c92aa542a0a52519cdcc7c6a478574670e9e4325
Merge: 2e585b05bf3c 936ab1659bf9
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Feb 2 17:19:28 2015 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all
commit 2e585b05bf3c667eb638b3e57ae1b8504cf1f789
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Jun 10 22:30:07 2014 +0200
openssl-0.9.8za -- fixes multiple CVEs
Change-Id: Id4a2d2af49518317511da194a582d3bb18c346f7
(cherry picked from commit 2f926a476b73a7c06a4579f422a4458ac3e789a1)
commit 5121a992d9db9b253757d1129ef898f77ee1b34d
Merge: 3413bc771307 e7a5986c377b
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Dec 12 16:43:48 2014 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+build' into private/jmux/libreoffice-4-1-6+all-new2
commit 3413bc771307dceec16ce43df56faa4ebbac1213
Merge: 8f93a737f358 ec45c7acab7c
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Dec 12 16:43:40 2014 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+lhm' into private/jmux/libreoffice-4-1-6+all-new2
commit 8f93a737f358acf20ad63e33a5fa490f05f27a84
Merge: 505f1c9ad4d0 f604b7a7f98f
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Dec 12 16:43:26 2014 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+sorted-vectors' into private/jmux/libreoffice-4-1-6+all-new2
commit 505f1c9ad4d02d59f44ec72c88b8d2a90db21f28
Merge: 8d1f528394bd 1db2b31b0619
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Dec 12 16:43:06 2014 +0100
Merge branch 'private/jmux/libreoffice-4-1-6+backports' into private/jmux/libreoffice-4-1-6+all-new2
commit e7a5986c377be2f8b780456b6bf8b1b831bfa269
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Nov 19 12:47:22 2014 +0100
Adapt (Jenkins) build script
Windows
-------
* Build multiple languages (same a linux)
* Force disabling of ccache
* Save external downloads to /cygdrive/c/sources/lo-external
Linux
-----
* Use system libldap
* Use system libpng
* Save external downloads to "$HOME/lo-external"
All
---
* Use JUnit
For whatever reasons the impress unit tests on Windows fail with
pre-compiled headers (PCH) enabled.
Change-Id: I7a125b0e5835a9a121f53dd03f022e0628905875
commit 81898e1a4c04a74903b1a155c4a0eaa4882dc059
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date: Wed Jul 30 12:47:58 2014 +0200
Change submodules location to old new name
Change-Id: I62d1aa75330a134014809d04851f5172f73b0ff8
commit 02c973bdf3bdd2e816c31b04cc428b967b468e8f
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Mon Jun 30 16:12:25 2014 +0200
proper relative submodule paths
commit 4267230bf586da3e127bf0c767091cbaf1373468
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Mon Jun 30 13:29:11 2014 +0200
official locations for submodules
commit a9705ede5f31a95cbc834b37760f9c8f1467138d
Author: Ulrich Kitzinger <ulkitz at hotmail.de>
Date: Thu Jun 5 08:58:53 2014 +0200
Submodule auf Branch libreoffice-lhm-416 gesetzt
Change-Id: I106c5575b79d60615bf1502acef9f0958afbf11b
commit ea3ce05abc7d0c22654a5c64077243b61cfcb119
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Thu Jan 30 09:18:40 2014 +0100
Branches von Submodulen auf libreoffice-lhm-41 gesetzt
commit be6930be115fefe4e466787ec779098a68b84d9b
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Jan 28 16:20:48 2014 +0100
In Git die Submodule geändert
commit 9834d459de8212352cb697b58c771d51484e7404
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Aug 8 11:36:05 2014 +0200
restrict to single language on windows, where multi language support has been reported to make problems
commit f081c55a352b6162c3d17ed0a1da3e7e757109f7
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Aug 8 11:32:41 2014 +0200
downgrade required by windows build
commit e1f6e71fa0d527bd169591aafc4b3b99f7cf6db9
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Aug 8 11:31:32 2014 +0200
factored out common option
commit d00da440f76e89d100000e60aa57aecff340b761
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Aug 8 11:31:03 2014 +0200
formal reorganisation of options
commit a8bcd3db764597b74066bc6c8a6ae1dcc841ae57
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Thu Aug 7 16:02:23 2014 +0200
make 5afde3a0f81bb6704a162de8de766b25d43bac78 really effective
commit 2aea65d2fb2f5a157d7f21ef7cb5064b9f9b386d
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:17:47 2014 +0200
modernized windows settings
commit ced4df11d0dc24598167de8e4215bd8391e08499
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:12:58 2014 +0200
factored out common version
commit b294619f22763c3b9868d6d48ac309c01d954072
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:07:40 2014 +0200
accumulation of configure options
commit ef93d00c24ab0a0ea40a849f87b278305596f2ca
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:04:40 2014 +0200
more uniform apperance of options, with slight unification
commit ce34965cf813f760822902058bcb701851d477cd
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 17:02:38 2014 +0200
lexical sorting of options
commit 94411ec6bea74308f7c559ede65f941531d898e6
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 16:58:08 2014 +0200
tuned whitespace
commit d17c97455a1d9031fff77f5370a42691198de266
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Tue Aug 5 16:55:57 2014 +0200
dropped dead code
commit bf29d3abbd23964fa15483658016e4b6ca3fd4dd
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date: Wed Jul 30 15:37:26 2014 +0200
Remove special handling of -ure- package
Change-Id: I22e8146c42f8e7e764377cfce4ef02fee6d976e7
commit 0aaab94b4529e26297622770eaae396db60d2f17
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Jun 13 12:55:26 2014 +0200
recovered adjustment for windows from branch libreoffice-lhm-41
commit d449ee168a9d5a19a018023c76825c102e8a7f8a
Author: Florian Haftmann <florian.haftmann at muenchen.de>
Date: Fri Jun 13 12:36:55 2014 +0200
obsolete
commit f10ad8216e242567177dcc23660b59666164e84e
Author: Ulrich Kitzinger <ulkitz at hotmail.de>
Date: Fri Jun 6 14:56:53 2014 +0200
patch-office-debs.sh-Skript an 4.1.6 angepasst
commit 915ffaa0ac4ef8dd76a16cd98ed4240aa3515bd8
Author: Felix Geyer <felix.geyer at dev-volker.tvc.muenchen.de>
Date: Wed Apr 9 14:19:32 2014 +0200
Create libreoffice-<APP>.png symlinks.
This is needed so the window icon is correctly displayed.
TRAC: #12093
Change-Id: If5cddb9da1d5187f774ec8a14cfbefee3ea80aa3
commit c437b43c9f0e07e979f7839168d89fcd0aa27181
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Wed Mar 12 15:40:16 2014 +0100
Template-Pfad wird vorkonfiguriert (Trac 11902)
Change-Id: I849ba05f96dd34fc74e7d8f34c5c3cc192dfdc8a
commit 0d4dcf30d99eee35c69126ad622c93ca1dcab2f0
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Thu Jan 9 12:37:26 2014 +0100
Änderungen am Build-Skript und Abhängigkeiten für Windows-Build
commit 4d0098e64d58b1073aeb1a23267cd44544aada51
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Wed Jan 8 14:17:13 2014 +0100
Im Skript patchoffice-debs Source von ooo-orig auf lo-orig geändert
Change-Id: I9ef23dfd4ee5619b5e3030b8e8697bc6b0cd34a6
commit 294f36a377be7b1f07f6e34fb74447a045ed4f01
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Wed Jan 8 11:31:10 2014 +0100
Build-Skript unterscheidet wieder zwischen kde und kde4
Change-Id: I015a4d4d1b2af1b4c2e3bcbab8ad546a13d367e6
commit ea50aef9da94c9844b6e1b4b283d292dd11c6b6b
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date: Fri Dec 6 16:32:51 2013 +0100
Bugfix: Don't move upload dir
The modified .deb files are referenced as links in the uploads dir, so don't
move it away...
commit 2b5fe385d4965a1b5a72b8ec6eee2fd1b39427c1
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date: Fri Dec 6 14:08:27 2013 +0100
Bugfix: Move "cd" to correct position
commit 2dab65c106ad34a88153f9f644ab4538a8b53f9c
Author: Ignaz Forster <ignaz.forster at muenchen.de>
Date: Fri Dec 6 10:23:35 2013 +0100
genchanges-lo.sh Hinzugefügt
Dieses Skript erstellt die für den Repository-Upload benötigten .orig und
.changes Dateien und wird aus dem Jenkins-Build heraus aufgerufen.
commit 45950fe074ae567d2647ae20aa4967418253e76b
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Wed Dec 4 17:46:24 2013 +0100
patch-office-debs funktioniert zu gut, Open-Symbol Paket ist noch nicht da => auskommentiert
commit bce991c8893687f9f0c208e6feccff40e4acef9b
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Dec 3 15:41:38 2013 +0100
patch-office-Skript nochmal angepasst
commit ea8cbe4dffa4efb4c08c0d3c2dcaed71643643d3
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Dec 3 14:50:06 2013 +0100
patch-office-debs angepasst um tmp-Pfad zu setzen
commit 56f58b980fc446c75da58a36ce5fbe4cc8b972b6
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Thu Nov 21 16:38:57 2013 +0100
Build-Skript um Hilfe ergänzt
commit 7487bb4cae2dff6dfe2425c4b060edc50d5e0278
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 15 13:52:43 2013 +0100
patch-office-debs.sh: Variable hinzugefügt
commit 9e437442b084554caf86dda3ae2d5110632e238d
Author: Simona Loi <simona.loi@>
Date: Wed Nov 13 14:51:46 2013 +0100
added function patch-tmp-path in patch-office-debs.sh
commit 4d640bd636c6ba57e9e8da487715ca9f35c712bf
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 09:47:40 2013 +0100
Build- und patch-office-Skripte hinzugefügt
commit ec45c7acab7c68b5798590f71f1358eda22252df
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Sep 25 18:14:47 2014 +0200
i#101283 Fix collapsed bookmark handling
Correctly position the insert cursor in the case of a collapsed
bookmark.
Change-Id: I46707ab0e019aec1050864c9cb404a834e9a67fe
commit 4c298d6cb928ce1aaab2e6f7880de78f4eeed4b9
Author: Michael Weghorn <m.weghorn at posteo.de>
Date: Wed Sep 10 14:56:25 2014 +0200
fdo#83753: consider JAVA_HOME and PATH when selecting JRE
adapted algorithm that selects the Java runtime to be used so that
Java installations associated with the JAVA_HOME and PATH
environment variables are preferred over others
Java installations are now analysed in the following order:
* installation that the JAVA_HOME environment
variable refers to (if it is set)
* Java installations in PATH
* other Java installation (algorithm that was used before)
Change-Id: I3a3ade25322def0c0432b369848f13a6b82034a1
Conflicts:
include/jvmfwk/framework.h
jvmfwk/source/framework.cxx
commit 3462867e4dcd39dc205fac210c8b9ad9483b5210
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu Aug 21 10:42:07 2014 +0200
fdo75996 Check search result for bookmark undo
This is quite probably not the correct fix, but it - at least -
stops LO from crashing when undoing bookmark changes.
Has to be tested to ensure LO actually correctly undoes the
bookmark change.
Change-Id: Id482943161079cf8a09799da9e67f4f4f4efb7e0
commit 7ef0fb915a157f4ab361430c2df553d9bb828c96
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Aug 20 12:59:09 2014 +0200
Update to latest translations
Change-Id: I24d7d98ea52c930beb4c6b387414341439f34f19
commit cf644323043d5439b350371965d5cdffb82c9bf7
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Wed Apr 16 16:04:19 2014 +0200
Patch von Lanedo für #11826 integriert.
Change-Id: Ic0e2306bfa8e943220d2d23177c241169c94a790
commit 22a99b059a0d7655e74b65441c706102be8d6896
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Mon Mar 17 15:13:14 2014 +0100
Auswahl von Papiergröße und -orientierung deaktiviert (Trac #11826)
Change-Id: If327010c6b2e88d5d638df5ce502e94f99355141
commit 76d02d660afe98b0ed1524eca1d8ade69ce60adc
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Thu Feb 27 18:15:06 2014 +0100
Zugriff auf static Variable synchronisiert (Trac 11400)
Change-Id: I623650afee10cc60b49067f4efbdc889b58007dc
commit c94c3de02601ec0ce8d5e736a08e6329908d67ca
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Thu Feb 13 15:12:42 2014 +0100
unopkg beschwert sich: 'unopkg: 69: [: =: unexpected operator'
Change-Id: I189eb1e44b3d31a30d1451ed8d6048f1bba285d7
commit 582fb01f213f6f99cc87a29d6be5ad1623315469
Author: Noel Power <noel.power at suse.com>
Date: Mon Feb 3 11:04:10 2014 +0000
Revert "fix Worksheet.Cells by now allowing TableSheet..." fdo#70079
This reverts commit 70aff4a7f7abe0c768238733ca8900b746e60189.
Change-Id: I8f8b423353ae1a825be91bd94308e87844948525
Signed-off-by: Noel Power <noel.power at suse.com>
commit 5570a926b4ca72d99ea518552d14ef06538a930c
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Thu Jan 9 12:37:26 2014 +0100
Änderungen am Build-Skript und Abhängigkeiten für Windows-Build
commit 7a440a444c0d055f227df7a9e1b7db330f56fa40
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Wed Jan 8 13:26:38 2014 +0100
Kde3-Pfade angepasst
Change-Id: Iafcd5ce09e9c700163d26110523211b273fb9d81
commit af3918aebd881a15ce614d775f0330c66a2b8a0c
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Nov 12 14:18:37 2013 +0100
Dialog 'Es ist kein Standarddrucker ausgewaehlt' unterdruecken
commit fcb38c6c6aec8552d189e0be7f99af9f71a3ba83
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Tue Nov 12 11:22:23 2013 +0100
Noch ein Compilefehler
commit 437eba28048a5f74f46b802371233c70926cf704
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Mon Nov 11 17:57:42 2013 +0100
Fix für AO Bug 74651
commit de9dd81f3c772afb28e9208d02d363a5cd1d3912
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 12:52:01 2013 +0100
In Paths.xcu Temp-Pfad angepasst
commit 1637281fac1951f5ba14524683231ac4ef898894
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 11:52:37 2013 +0100
unopkg-Sript setzt Root-profil, wegen Trac #11013
commit 0bf0a12873d2a7b59f26a0f44f13ee062342088a
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 11:48:31 2013 +0100
Update-Button im Extension-Manager disabled
commit 841ce3da9a9adc7d9ba8c3772c416cbfc5846e33
Author: Ulrich Kitzinger <Ulrich.Kitzinger at muenchen.de>
Date: Fri Nov 8 11:26:06 2013 +0100
Änderung für Übernahme von Mail-Adressen aus Link, Trac #4335
commit 3373f6ca0583e8c973115e57f1106c9656741d1f
Author: Limux <limux at muenchen.de>
Date: Fri Sep 7 13:01:58 2012 +0200
ExtensionUpdateURL empty
Update-URL für Extensions auf Leerstring gesetzt.
Change-Id: I136c53baffdd84ad10c644fc304d8b7a60df3b99
commit b002226b5c9a970960de39be535e97e861860866
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Dec 16 21:11:14 2013 +0100
Handle fixed page size printer option.
Correctly handle the printer option "fixed page size". If set,
pages are centered and trimmed onto the fixed page, regardless
of the page size option.
Change-Id: I10f6f5a10268c452847f032e204df8f363be99a1
commit df99eedf567d80bb52842114fc5c43c1906c3463
Author: Ulrich Kitzinger <ulrich.kitzinger at muenchen.de>
Date: Mon Dec 16 21:17:49 2013 +0100
Add sub-menu to open templates.
Change-Id: I8039419b3a4a41321f00d24ce80366a42cff171d
commit eea94337c247f1044d13329c07ba05fb18be3322
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Dec 16 20:42:48 2013 +0100
fdo#64146: change file merge of numbered lists.
Have a more sane handling of inserting a file, which starts with
a list into an already exiting file at a list position.
Change-Id: I062a876b758a0673a10a5f4b2675430cf1477a79
commit f604b7a7f98f20d2366b9b5a750374a59433f3e4
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jun 10 12:32:32 2014 +0200
Optimize lcl_GetUniqueFlyName
(cherry picked from commit 403b074a707b2f13e8fb814f537ffb08d7f9b3ed)
Conflicts:
sw/source/core/doc/docfmt.cxx
sw/source/core/doc/doclay.cxx
Change-Id: Ic894ee471982496ac82dc426c803aba92b8554c2
commit 982b25ffe4d9f32bfed0187278a0a26a5a7e1632
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jun 10 11:40:43 2014 +0200
Optimize FindFlyByName
(cherry picked from commit 695c52c7a7dba92ae2129c520c53b2055e948f8d)
Conflicts:
sw/source/core/doc/doclay.cxx
Change-Id: I004226f8aded4e7909a104ec0ba405223f2d7e0e
commit c891dfba7544cb4f936b1e9f2c0d0303c2524a99
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Sun Jun 8 19:41:53 2014 +0200
Convert SwFrmFmts to a o3tl::sorted_vector
(cherry picked from commit ec88c524a764b89c034d9347926ba903d6a24402)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I6ca87d3dd9a3b7067380bb7ebaef306b87516dfb
commit b4ba309d99f5a0ec4f3fdcaaccaf43b970c8bfe0
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Sun Jun 8 01:59:29 2014 +0200
Change SwFrmFmts to o3tl::sorted_vector like API
This changes the SwFrmFmts class std::vector inheritance to private
and extends the class to a o3tl::sorted_vector compatible API.
This should just be a cleanup patch and is a preparation for the
change of SwFrmFmts from vector to o3tl::sorted_vector.
For simple list cases, this also adds a SwFrmFmtsV, a std::vector
version of SwFrmFmts.
(cherry picked from commit 1eee8d38ee5107ff6c3aaa2583854a88c1e8bb0e)
Conflicts:
sw/inc/format.hxx
sw/inc/frmfmt.hxx
sw/source/core/doc/CntntIdxStore.cxx
sw/source/core/doc/DocumentLinksAdministrationManager.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/textboxhelper.cxx
sw/source/core/layout/atrfrm.cxx
sw/source/filter/basflt/shellio.cxx
Change-Id: I2e91cb4d650b1c46c531885869d201edba84e5a6
commit 973258dfd41f6226f7b3fb7083c36bbd8c31c19a
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Sun Jun 8 01:57:54 2014 +0200
Add sorted vector special case for delete all
Specializes DeleteAndDestroyAll() to optionally keep the default
item.
Change-Id: I570fc6614a59fcf08c4569d44873ed79f4af5eda
(cherry picked from commit f4efc9051a25f52ed218c515dc8c5a75f54c8fbd)
commit 53eeb6a0ae256f69a40eb49a0bd619955fcc0a64
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Thu May 22 14:25:32 2014 +0200
Merge common code of sw format lists
Moves the common code into an intermediate template class, which
still provides an SwFmtsBase interface.
The only changes are some dropped explicit "const" casts.
(cherry picked from commit 146439e1167c8dd4edd245b9b100af4b5442158d)
Conflicts:
sw/inc/docary.hxx
sw/source/core/docnode/section.cxx
sw/source/core/tox/tox.cxx
Change-Id: I8894fbc53e7b1ac1b1e590bba932a9f9cc33f448
commit dc1212e036d7b1db61cde93623bfb78927cbb4d6
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon Jun 2 17:46:39 2014 +0200
Optimize AppendAllObjs for vectors
Removing items from large vectors, especially from the front, is
very expensive. For a large mail merge job it took most of the time
to memmove the descending vector items.
Instead of remove, this simply overwrites the current with the last
element.
Change-Id: I12395388f4e315009602984acb443382fcce9f44
(cherry picked from commit a196a7575c48aaf6b5904565e18d31eacc80c855)
commit 5039393f717da2e927b51cb536ee5d6c24dfaaa2
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri Jun 6 09:44:34 2014 +0200
Directly convert frame name tails to Int32
This is a little optimization for large mail merge jobs with many
frames. The current alorithm doesn't only try to produce unique but
also reasonable names for the frames.
Per se the algorithm is horrible ineffective for large numbers of
frames, but this is impossible to fix without changing the
underlying vector of frames to a sorted one to find and check just
the correctly prefixed frames.
This patch directly converts the frame names tail instead of
creating substring of the number tail, which saves billions of
malloc and free calls seen with my sample document.
(cherry picked from commit 5f6db9260ec42a040a4ce21e93af2f1e18746fe6)
Conflicts:
sw/source/core/doc/doclay.cxx
Change-Id: Iefdee4053480f40f106c49867bc5a64ec207ba1b
commit 2db7feefb9d0d3af12b2f898a2e0e7054c2410ad
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Fri May 16 23:42:32 2014 +0200
Convert SwPageDescs to a o3tl::sorted_vector
Originally I planned to use a boost::container::flat_map, but there
seem to be no way to directly access the indexed vector.
And since this already needs the "first item is default" special
handling, o3tl::sorted_vector is used with the offset.
Change-Id: Idfb79af8ddfd5f5e2e6ca312b46d30e3ddc166d9
(cherry picked from commit 014cb3c9598f10bd316a7df8aa1e66ddb20b9b5e)
commit 7aa88604e3d4f66f2223b19a9bed25334ce1aad1
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jul 22 12:45:47 2014 +0200
Fix broken sorted vector usage
Fixes and optimizes a few places, which will fail in case of the
sorted_vector conversation.
This drops a simple optimization from the ww8 filter. I'm not
sure it's worth to memorize and just update the new styles.
(cherry picked from commit a5ff456973e97508f6c926ec889dea2f9b4fe666)
Conflicts:
sw/inc/fesh.hxx
sw/source/core/frmedt/fedesc.cxx
sw/source/filter/inc/fltshell.hxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/uibase/app/appenv.cxx
Change-Id: I7a444013f59e81c81049cd40b9d9cfa0e29623c0
commit 03e2a6ee6c2ac556b4f196a39135de2d6569f361
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed May 14 15:03:53 2014 +0200
Optimize SwPageDesc lookup by pool ID
There are just ten default page pool style IDs.
So instead of walking the whole style list to find the matching
style ID, this introduces an additional index / array for faster
lookup.
(cherry picked from commit 3cd2f4c974f9119e920a75a00d194641c2808c94)
Conflicts:
sw/source/core/doc/docdesc.cxx
sw/source/core/doc/poolfmt.cxx
sw/source/core/layout/pagedesc.cxx
sw/source/filter/html/htmlcss1.cxx
Change-Id: Iacfa40c76e5502dc90665be0a96388de50d5ec16
commit f8202145464c7dbb3758e780dee038582d54ac01
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jul 22 13:01:36 2014 +0200
Drop local FindPageDescByName implementations
There are quite some place, which manually walk the vector of
SwPageDesc to find the named item. Replace all of them.
(cherry picked from commit feb3b0c0b1d7fe2cce55954895a8f7cdccc61605)
Conflicts:
sw/source/core/doc/docfmt.cxx
sw/source/core/unocore/unosett.cxx
sw/source/core/unocore/unostyle.cxx
Change-Id: I7ade35b78d8208dc00ee56a8f83c3ebadaebb8af
commit f806f27dd6d7fae8cf723b0a6a815f64cf2ffd8b
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jul 22 12:39:51 2014 +0200
Introduce SwDoc::DelPageDescP and ChgPageDescP
Variants of DelPageDesc and ChgPageDesc, which work with the
SwPageDesc pointers instead of the names.
This moves all the code from the "name" to the "pointer" functions
and just adds a FindPageDescByName to the old functions before
calling the pointer variants.
(cherry picked from commit 41f386877a4c71295c3264720cbefd51d9bb7266)
Conflicts:
sw/inc/doc.hxx
sw/source/core/doc/docdesc.cxx
Change-Id: Ife03986ec2a3897273edd64b8136474441b6b771
commit a06e9c3e9924b83b0414348057ece5f1892d8f17
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Tue Jul 15 19:28:17 2014 +0200
Rename SwDoc::FindPageDesc to FindPageDescByName
Both functions were consolidated in
commit c1be76ec98cb465e07df961843134147100beaa9
Now re-rename it to introduce FindPageDescByPoolId later.
(cherry picked from commit 3a696e7af2ed8bef1cc2be9a731fe2bd92e87aa7)
Conflicts:
sw/source/core/layout/pagedesc.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/uibase/app/docstyle.cxx
Change-Id: I6b96b322eb133615e3a2c692fb7f655d6f22fc8f
commit d5e2372812473067696dac081c4c7d8471fbe297
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon May 12 16:00:02 2014 +0200
Change SwPageDescs to o3tl::sorted_vector like API
This moves the SwPageDescs class to pagedesc.hxx, changes the
std::vector inheritance to private and extends the class to a
o3tl::sorted_vector compatible API.
The insert internally still uses push_back.
This should just be a cleanup patch and is a preparation for the
change of SwPageDescs from vector to o3tl::sorted_vector.
(cherry picked from commit 07cc52be8746eff7e77cb31f507fe0a847157f82)
Conflicts:
sw/inc/doc.hxx
sw/inc/pagedesc.hxx
sw/source/core/doc/docdesc.cxx
sw/source/core/layout/pagedesc.cxx
Change-Id: I08561c139d1af9bad6ca68be27466fac33fab384
commit 5ac1bf85763a957c043aace76ce2be92bfdaf7eb
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Mon May 12 10:20:00 2014 +0200
Sorted vector special case: default first element
A lot of code using vectors in LO relies on the fact, that the
first entry in the vector contains the default value.
Therefore this adds a boolean to the constructor, which leaves
the first entry unsorted in the vector and special cases find
and insert.
Additionally lower_bound, upper_bound and Resort will skip
the first element.
Change-Id: I9603f47be4fb56d991f42066ce9f5ad0ab6ffdf8
(cherry picked from commit 3f1c34cd231bcb7067ccb0d4e64d5ab5cdab4879)
More information about the Libreoffice-commits
mailing list