Public Git Hosting - LibreOffice.git/log

adjust output file extension when exporting (bnc#870581)

If foo.odt is open, 'foo.odt' is the file name passed to the file dialog
for File->Export to PDF (simply because it's the document name). If automatic
file extension is enabled, the file dialog will fix this to the PDF file type,
but if disabled, the default filename will remain foo.odt, possibly overwriting
the source file if the user confirms without checking.

(cherry picked from commit cadf6cc31ffa000d1fe8e42cc3e6cd427e0104bd)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I46504630b5f4e489d5a0cedf0b2b358305763722

handle properly page breaks even if a page contains only a frame (fdo#55381)

The test document has 4 pages which only contain frames, first 3 pages
(sections) have <p> block with <framePr> and another <p> with just <sectPr>,
and the second paragraph would be removed, thus there would be no nodes on which
to actually set the page style and they would be set on nodes for the previous
page, overwriting its page style. The last page does not have its own <p>
at all, so it needs to be faked.

The changes in finishParagraph() are because of e.g. the comments-nested.odt
sw test, which there causes exception because of unknown property ParaStyleName
(comments do not use those it seems) and the code is skipped over (which
is probably a bug on its own, but it's unrelated to this change otherwise).

Change-Id: I9d37f992407a9b649c710d2a031ec4447fb11771

fdo#77603 new wildcard in autocorrection: .* instead of *

(cherry picked from commit 022e351c2431e0260220a51a54d576f49f789ebc)

Conflicts:

editeng/source/misc/svxacorr.cxx

Change-Id: I04700e742239c97de39cf502fd8b0845b03c4e3a

prevent KDE/Qt from interfering with the session manager

I occassionally get lockups in IceProcessMessages() called from QtCore,
I'm actually not exactly sure why, as theoretically two connections
from one app shouldn't be a problem, but since LO does its own
session handling, there's no need to the KDE/Qt code to be involved,
so prevent it from connecting to the session manager altogether.

Change-Id: Iebe20d4cb5403e5fea8bd5d8c1f69b62d1c2907b
(cherry picked from commit 71f2aff7a56cef4e133abad3c2e447c76c5ee1fe)
Reviewed-on: https://gerrit.libreoffice.org/9079
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>

fdo#75735 RTF import: fix COW when writing a nested structure

Regression from a48e2fd9049797110b3b2505c363557284987ca8 (fdo#44736 -
convert RTFSprms to a copy-on-write structure., 2012-12-07)

(cherry picked from commit 6b6e4d471c2954d34d280398ed1c986d7fb27ae1)

Conflicts:
writerfilter/source/rtftok/rtfsprm.hxx

Change-Id: I2538f440e29cef6d40db2ea914e4afcbfe411890
Reviewed-on: https://gerrit.libreoffice.org/9100
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>

Related: rhbz#1088625 PresenterPaintManager seen as NULL

Change-Id: I3b7ba51d48ebc5f9304f6125de0595d41d50ad4d
(cherry picked from commit 42dd5615429e6273e9169a4bd941ad56fec1e6f6)
Reviewed-on: https://gerrit.libreoffice.org/9094
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

every even numbered print job is reported as failed

because of.
bool bSuccess;
...
bSuccess &= ...endSpool(...);

in PspSalPrinter::StartJob

was...

endSpool return value is effectively success flag, not job ID

(cherry picked from commit e6323214830895d1c76ec44ee53990bf577fbda2)

Change-Id: I5b96eeff80ca29f0f8f24ee6da7a2ca76cbb05ce
Reviewed-on: https://gerrit.libreoffice.org/9093
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

handle strange brightness+contrast adjustment from msoffice (fdo#38410)

LO uses basically the formula "newpixel=(oldpixel-128)*contrast+128+brightness",
i.e. contrast is applied first. It looks like there's no "oficial" formula for this,
so a formula that applies brightness first would be ok too. MSO for some weird reason
apparently uses a formula that applies half of brightness before contrast and
half afterwards (insert funny political correctness or compromise joke here).
While the result is the same like with the LO formula if only either brightness
or contrast is adjusted, the result is different if both are involved. Just modify
the image using the MSO algorithm if this is the case.

Conflicts:
filter/source/msfilter/msdffimp.cxx
include/vcl/bitmap.hxx
include/vcl/bitmapex.hxx
include/vcl/gdimtf.hxx
vcl/source/gdi/bitmap3.cxx
vcl/source/gdi/bitmapex.cxx
vcl/source/gdi/gdimtf.cxx

Change-Id: I55fe8f395832685b90f024cf2f58b0797c1ba588
Reviewed-on: https://gerrit.libreoffice.org/9099
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

coverity#1202882 Dereference before null check

Change-Id: Ie61df08c11b687c0b4a3ae212b3f9a6c95171396
(cherry picked from commit c152349f69acfb6bb873ed1cd12ca1b6dc325f1f)
Reviewed-on: https://gerrit.libreoffice.org/9095
Tested-by: Andrzej Hunt <andrzej.hunt@collabora.com>
Reviewed-by: Andrzej Hunt <andrzej.hunt@collabora.com>

Resolves: rhbz#1086714 overlarge pixmap

(cherry picked from commit f31ac2405bbd0755fb14daa6cb84d7bb7d84c492)

Conflicts:
canvas/source/cairo/cairo_xlib_cairo.cxx
vcl/unx/x11/xlimits.cxx

Change-Id: I015308406a43e6b039059a5e35316d59745d0a48
Reviewed-on: https://gerrit.libreoffice.org/9083
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

zero various members

(cherry picked from commit 9de20d1eb046f7bb92d893408206b91a9c054e2e)

Conflicts:
filter/Module_filter.mk
filter/source/graphicfilter/ipcx/ipcx.cxx
filter/source/graphicfilter/itiff/itiff.cxx

Change-Id: Iad6948fdf6eb60f86d764783b72a4fe7f5642e40
Reviewed-on: https://gerrit.libreoffice.org/9082
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

fdo#77342: sw: fix copy/paste of footnote cross references

The fix for sequence fields broke the footnote references some more;
simplify it by handling the footnotes in the same way as the sequence
fields, and not remapping GetExp fields for which the corresponding
SetExp field / footnote is missing.

Also, don't do any remapping when the target is a clipboard document, to
prevent modifying the source document.

(regression from bb665affbd8870652ade3951d626d76e99143f67)

(cherry picked from commit cbfcb837fb06a14daf5281ae13fc1886328cee6f)

Conflicts:
sw/source/core/fields/reffld.cxx

Change-Id: If1be1e1d9742182a4085bbbff53e26a8fa8665b8
Reviewed-on: https://gerrit.libreoffice.org/9085
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

limit the range shrinking in charts to really large ranges, fdo#70609,

Also improves the situation for fdo#55697.

It is just the fist step to a better algorithm.

Change-Id: I15de1ca6604e585fcf5690f0d903c757d641e765
Reviewed-on: https://gerrit.libreoffice.org/9078
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

fdo#74697 Add Bluez 5 support for impress remote.

This time we:
- Don't break SAL_WARN with an fprintf like syntax.
- Replace DBUS_TYPE_UNIX_FD with it's definition 'h' as we might
   be building on dbus-glib versions that do not support it (however
   presumably anyone running bluez 5 will have a dbus version that is
   new enough to support this, i.e. purely a build-time issue).
- Remove various C++11'isms.

Change-Id: I736cad2122cd3789a5c7fb62c39e409d41fc1e32
Reviewed-on: https://gerrit.libreoffice.org/8924
Tested-by: Andrzej Hunt <andrzej.hunt@collabora.com>
Reviewed-by: Andrzej Hunt <andrzej.hunt@collabora.com>
(cherry picked from commit b15666fd7582729c75bd0dd1bd0cb5d7c5a77f0c)
Reviewed-on: https://gerrit.libreoffice.org/8931
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

Resolves: fdo#76916 'User paths' is missing in tab MotionMotion Paths tab

(cherry picked from commit 8b9858b0aeae8bfb3af6dd8fcfce6cecdb9b8fab)

Conflicts:
sd/source/ui/animations/CustomAnimationCreateDialog.cxx

Change-Id: I38deeae3135badde23b9d454d548193af654caab
Reviewed-on: https://gerrit.libreoffice.org/9076
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

missing header include

Change-Id: I5bb1f1f5a457d4d390318fc793b15df078423c8c

fdo#74687: Undo & redo of format-only changes don't need broadcasting.

Also discovered that the undo path was broadcasting twice. Let's only
do it once.

Change-Id: I169f1659aecb1eb78be3a497e244f79c5883e50f
(cherry picked from commit 1d1fbbe81b4435765d3f69c6bcae2840dc629912)
Reviewed-on: https://gerrit.libreoffice.org/9075
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

fdo#74555: Avoid excessive calls to GetPreviewCellStyle().

GetOptimalHeight() gets called *all the time* and is very performance
sensitive. Let's not do an expensive operation such as GetPreviewCellStyle()
which slows down pretty much everything else after the non-default font is
applied.

Change-Id: I5d5b2e706dd5dd98173044642b98ccaedd9536f0
(cherry picked from commit 947177a5cb79e03a415d9c3d1203420c874d2b35)
Reviewed-on: https://gerrit.libreoffice.org/9074
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

fdo#75665: Truncate string when clipped on screen.

This improves performance of text layouting by HarfBuzz for very long strings.
HarfBuzz's layout algorithm appears to be more expensive than ICU's.

(cherry picked from commit 087a79db1272858f107656c5ca3c6efb45680986)
(cherry picked from commit 6fa4d31d6a7e363285f22d4c0012521d10073652)
(cherry picked from commit 8e50a6c7b1cb9481cce42c71ff07e921fb4292d0)
(cherry picked from commit 21fc47e115530780ad45ae64e8076dc5e9fedb5e)

Conflicts:
sc/inc/scopetools.hxx
sc/source/core/tool/scopetools.cxx
sc/source/ui/view/output2.cxx

Change-Id: Ic9738b7b8f0f1a29c51c83b147763118939b90ef
Reviewed-on: https://gerrit.libreoffice.org/9057
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

Resolves: fdo#75525 out by one error

(cherry picked from commit 12984e46704f1e55f76b210cf65217e54662dc26)

Conflicts:
starmath/source/dialog.cxx

Change-Id: I0171d2a79b6b015fa2f01d78228e901005017fb0
Reviewed-on: https://gerrit.libreoffice.org/9066
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

fdo#75026: Sometimes we need to update grid view while not being active.

For example when "jumping to mark" in the non-active window triggered by
hyperlink in the active one. The jump-to-mark command gets dispatched before
the new window is officially activated.

Change-Id: I4e9c126b061ee3af4440e36d1ba6d796eb1c3539
(cherry picked from commit 52cc88d6191ba0c4b6477e5c4b9c5d0f0228030d)
Reviewed-on: https://gerrit.libreoffice.org/9068
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

LibreOffice from Collabora Windows configs

Change-Id: Ie7972d2760cbbb311a235682af786079b33b6811

webdav serf: remove SAL_OVERRIDE from destructors

Change-Id: Id55b972dda34623eeb3e046a70757277377d3871

LibreOffice from Collabora ARP data

Change-Id: I83d28b9bc7985f34303d3c3343f976b5a87009e1

property REINSTALL should be set only when we apply a PATCH

with 11dd1094cb5452a8b61ad6bd284ba9517d3d869a I introduced
REINSTALL=ALL in the Property table, because without this MSP
patches did not work as expected -- some files were not patched.
I found "The file represented by File table key 'foo.bar' has
no eligible binary patches" lines in the log, and I did not find
a better solution. I'll revisit the problem later, maybe file versioning
can be changed. Windows Installer usually ignores the fourth digit in
version numbers, and we bump the the fourth digit only (i.e. 3.6.10.304 ->
3.6.10.520).

However, when upgrading a patched 3.6 to 4.0, REINSTALL=ALL strikes back.
Windows Installer passes REMOVE=ALL argument to 3.6 package, but REINSTALL=ALL
takes precedence, so 3.6 will not be removed, but reinstalled! 3.6 and 4.0
both will be installed, there will be an entry for each in Add/Remove Programs
Control Panel applet.

So I made REINSTALL=ALL conditional, and as a side effect, normal MSI
packages built from PTF branches will be fully useable again. If REINSTALL
is set for a product that is yet to be installed, no installation action
will take place at all. It really makes sense to selectively enable it
only for patches. I'm sorry that I did not figure this out earlier.

Conflicts:
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt

Change-Id: Ic05dc66579c60f1eb599baf6be4289b22301cebe

LibreOffice from Collabora EULA

Change-Id: Ia380db465f5094216cb36526f6cc178043376356

shell build fix on Windows

Change-Id: I500f8a86bb9bca5532577a37268b94fb8a8c8b16

LibreOffice from Collabora versioning

Change-Id: Iff7004808f9637f3dbc6393751246c3a82134487

disable Liberation fonts on Windows

Change-Id: Ief9ee02f78f08a3002cc3ced3b9da80fc855aeef

Collabora branding images

Change-Id: Ibd86006d2577107f2b99b96e168d8519061f9077

Start Center background color Collabora purple

Change-Id: If7ff36a2c87d26a6dd6e6eaaf43461b895d2ddc9

fdo#72400: slideshow: display a snapshot of movie until its not started

Change-Id: Ibd81f2aada458dd7437053b59882d3200f78747e
(cherry picked from commit 539017f1d96b0ca2c062ed7ffd2f48166f831493)
Reviewed-on: https://gerrit.libreoffice.org/8949
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Slideshow: Fix regression related to media animations

Misc effects tab page animations were lost.
Regression from
9695f38ca4ab26b40524f2eade98c45f0360131d.

Change-Id: I81f7321d7dd87f5b0f6b4acbecbd60241ab1e430
(cherry picked from commit 81e98150cc04ad764abc668dc12b91d3de90369e)
Reviewed-on: https://gerrit.libreoffice.org/9054
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

fdo#77027: ODF import: fix wrong version in check for embedded objects

SvXMLImport::LO_4x does not mean 4.0+ any more.

(regression from 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52)

(cherry picked from commit 25a2eab22798373b8197f1e594568207eb7c5039)

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: Ib444762c2d6e4d051e99962eaff1b1ed34af983a
Reviewed-on: https://gerrit.libreoffice.org/9064
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

ODF import: detect "LibreOfficeDev" in meta:generator too

(cherry picked from commit 74d7911abf77643544c58a0d3e5fb956add76c44)

xmloff: we used to call it LOdev back in 4.0 so check that too
(cherry picked from commit 5d53cabb52648507086a39e06803624949e4a301)

Change-Id: Icea3086975dab1afedf111364683e6a7de50ce41
Reviewed-on: https://gerrit.libreoffice.org/9063
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

fdo#72287 Scroll automatically to show selected item when keyboard used.

806919adf9c9bafbaba92c2d2ab35d2e2f9863f8 added finer-grained scrolling using
the scrollbar / scrollwheel, but inadvertently prevents the display from scrolling
when an item is selected that is currently offscreen (e.g. by using the down-arrow
button on the keyboard).

Change-Id: Iaa3a7dc6d214741d37cf4ec78c00ed0034ed1e42
(cherry picked from commit 717aa1ac75ddd54fdf72cd4de6551f1fb536da9b)
Reviewed-on: https://gerrit.libreoffice.org/9017
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Fix fdo#71423 - crash while editing Impress tables.

Band-aid fix for this nasty crasher, seems sometimes the
family item is not found.

Change-Id: I7f78d59cbf2c9595ad512fa7a78370629924cd06
(cherry picked from commit 058cfa72dcdd91df302be45f7fc59b0d961a420b)
Signed-off-by: Andras Timar <andras.timar@collabora.com>

fdo#74743 avoid infinite loop when gathering "svg" element styles

Change-Id: Ifcfd0c64302b9174510e3d774607f5ca60173885
Signed-off-by: Andras Timar <andras.timar@collabora.com>

fdo#77267 RTF import: pard should reset current paragraph style

Change-Id: I8d78ce262a4e57161325231a78e48750909b1bad
(cherry picked from commit 904630a2272ac4dd540939f8a462bff5d636f066)
Reviewed-on: https://gerrit.libreoffice.org/9055
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

fdo#74654 fix typo: printnone -> printhigh

Change-Id: I286dedfb6dfd8d9c119bf1b6ac777a2a08f22d7e
Reviewed-on: https://gerrit.libreoffice.org/9015
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

fdo#74599 RTF import: enable StylesNoDefault compat setting

The Writer 'Heading 3' paragraph style is gray by default, but (just
like in case of DOCX) that shouldn't have any influence on the RTF
import result.

Fix this by moving the compat setting from the DOCX filter
implementation to the common dmapper.

Change-Id: I86c7cf1a66f82b438ce8379467773a88c9e229af
(cherry picked from commit 2df53ef5002270bfe788e383e95002f636a242d9)
Reviewed-on: https://gerrit.libreoffice.org/8945
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

fdo#76409: Write output cell string to <text:p> element when saving to ods.

The change was made by accident.

Change-Id: Ife2461b0fca6e3ea5a65d72d985d1e0976737b5a
(cherry picked from commit a0752fa4246dc71b64907c679657a1af3cb617e1)
Reviewed-on: https://gerrit.libreoffice.org/9014
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

fdo#76294: Properly intern string literals in formula on xls import.

(cherry picked from commit b09426b83c12b0cd27cd909602251cb076ffa4ba)
(cherry picked from commit 625c595fc30d2e6153735dc2ed2359ff4f8a1e3a)
(cherry picked from commit 6bb7fa8df523d3ae7b9945009fb1034f28cb0a0a)

Conflicts:
formula/source/core/api/token.cxx
include/formula/tokenarray.hxx
sc/source/filter/excel/excform.cxx
sc/source/filter/excel/excform8.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/inc/XclImpChangeTrack.hxx
sc/source/filter/inc/lotform.hxx
sc/source/filter/inc/qproform.hxx
sc/source/filter/lotus/lotform.cxx
sc/source/filter/lotus/lotimpop.cxx
sc/source/filter/lotus/op.cxx
reportdesign/source/ui/inc/Formula.hxx

Change-Id: Icf962a4363887f323da6d2bdf935a027df3319fa
Reviewed-on: https://gerrit.libreoffice.org/9008
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

upload libetonyek 0.0.4

(cherry picked from commit d24634a6d4046db208428eb999012c03bd9a5c48)

Conflicts:
external/libetonyek/UnpackedTarball_libetonyek.mk

Change-Id: I64a35ca0902ba40a4fba3080181147b4facac2ee
Reviewed-on: https://gerrit.libreoffice.org/9009
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

fdo#77209: Share string pool with clip documents.

We do the same with undo documents, and it will only make sense to do
the same with clip documents as well. Also, put the sharing part into
a common method (for ease of tracking).

(cherry picked from commit 8f403051968298fbabd61de82fbb6a77762c83cc)

Conflicts:
sc/inc/document.hxx

Change-Id: I342b22d95374ee06d16318a66ffea0ac5b42621c
Reviewed-on: https://gerrit.libreoffice.org/9005
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

fdo#74087: Inspect if a mis-spelled word is at cursor position...

then decide whether to launch a spell candidate menu or a regular context
menu.

(cherry picked from commit cd22c3442389f69fc1cc14dd07b17f5a59498e5e)

Conflicts:
sc/source/ui/view/gridwin.cxx

Change-Id: Ib121e9c6729e068c70ff216391f863639aa01951
Reviewed-on: https://gerrit.libreoffice.org/8943
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

handle .doc cropping also inside groups (fdo#38411)

Writer does handle cropping on its own, but only for "toplevel" images,
not for those inside groups, so there still use the generic code.

Change-Id: I805a4cbd2d4cea7008e0322688ccd7f35a6d4a2c
(cherry picked from commit af51f3fb5aee469423b154958ccb3fe61284122f)
Reviewed-on: https://gerrit.libreoffice.org/8950
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

fdo#75970: Let's do it in a straightforward fashion.

No idea what the intent of this weird static heap instantiation, but
apparently it's not helping us.

Change-Id: If6cccf649958b6cf01ede992c286af68eaeb31f6
(cherry picked from commit 0ffe4358c755504bc2754ef88edadde33b5f395a)
Reviewed-on: https://gerrit.libreoffice.org/8939
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

fdo#77307: Compare external formula tokens correctly.

To avoid different external (add-in) tokens from being evaluated equal.

Change-Id: If78187901bdca7fe0da50442b0bb66e0650dc70f
(cherry picked from commit f9cc0daec26016722bf5260e4e2634e6dcfe25a2)
Reviewed-on: https://gerrit.libreoffice.org/8942
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>

smoketest: remove OpenOffice.org 1.0 XML format export tests

... which fail since the export filter was disabled in
aeeaccf59abbc485d7786486f1accc1cb4d4dbf7.

(cherry picked from commit 694a6478c1cfe18579dc9b355bda3db836b0b3a2)

This is part of the fix for fdo#74979.

Change-Id: I10969a96394d2972376a792af645ff48ccdab7c0
Reviewed-on: https://gerrit.libreoffice.org/8938
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

Remove OOo1.0 file formats from Save As.

List discussion: http://lists.freedesktop.org/archives/libreoffice/2013-November/057337.html

Reviewed-on: https://gerrit.libreoffice.org/7489
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit aeeaccf59abbc485d7786486f1accc1cb4d4dbf7)
(cherry picked from commit c9c4148f00f60a9bb986e9431e76ab7cf8b4c547)

This will be used as a "fix" for fdo#74979.

Change-Id: Iea7e5d9ed8f0e48ffce4504bfaaf0d41067c7a5d
Reviewed-on: https://gerrit.libreoffice.org/8937
Reviewed-by: Bryan Quigley <gquigs@gmail.com>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

fdo#76961 - Calc link auto-update interval is changed on file save

The commit fa0fe19e89ba68a6b02cbdd5eff6bc161024c53d accidentaly made the
external links auto-update interval save seconds as milliseconds. This patch
fixes the problem at least on Mac and Windows where I tested it. I also
did a successful build on Fedora 20 with this patch that works as expected.

Change-Id: Ia10d12fb678004a686a4eaa65e9e12f09378a440
Reviewed-on: https://gerrit.libreoffice.org/8934
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit cf1d4c02c14772824a7149957fa119c6e290640b)

Signed-off-by: Kohei Yoshida <kohei.yoshida@collabora.com>

check that stacks are not empty before top()

Change-Id: Iad5b3381b8201c5ac32a5bdf99bd3d5872ea3afc
(cherry picked from commit a1ea3838adee634ccf725bc5f2be7805c6294a16)
Reviewed-on: https://gerrit.libreoffice.org/8932
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

include last record in language-subtag-registry.xml

(cherry picked from commit f854b05013a587a6ea568b32180f5c81de26eeeb)

disable test and document why

disable build breaker test

(cherry picked from commit 73c70f28ba41c7a602d7befde84c5b54187694d7)

document why the test fails and is disabled

(cherry picked from commit 2803e5c1e7112882003c3e2301f8e28f3dc2b6b7)

Change-Id: Iaca0fc9ca12ee672f640be9c639b7b0d0dd3bc10
Reviewed-on: https://gerrit.libreoffice.org/8921
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

build liblangtag with updated IANA language-subtag-registry

... as downloaded from
https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry

Reviewed-on: https://gerrit.libreoffice.org/8919
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 39d29be28b92328149430045f1e10e1ebeb6a0eb)

Conflicts:
download.lst

Reviewed-on: https://gerrit.libreoffice.org/8920
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
Conflicts:
download.lst

Change-Id: I7aee9c6e42aabc9e023ab9a2ec3880dbde940396

fdo#77300: Don't re-compile formulas when the hybrid formula is not there.

Change-Id: I9b0f8d031fec08bb8d92333ff67074fdc739e034
(cherry picked from commit 66c6a3bfc9cd89c562107d3d369b3d82bae94d68)
(cherry picked from commit 0e63ca4fde4e446f346e35849c756a30ca294aab)
Reviewed-on: https://gerrit.libreoffice.org/8928
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

fdo#73588: fix default alignment in RTL mode.

(cherry picked from commit 036b1fccbfb87a1aab36632843deb29e0a70630f)

Change-Id: Icb932ee51dbf32d8baf4382aa00e89a680f5a41d
Signed-off-by: Kohei Yoshida <kohei.yoshida@collabora.com>

re-enabled user-defined numeric fields for dBase export

Since commit f59e350d1733125055f1144f8b3b1b0a46f6d1ca it was impossible
to define a numeric field with a precision of less than 2 decimals, even
if all values were integers. It was also impossible to define a field
width larger than needed for any values in that column. Furthermore, the
integer part was shortened if the overall column's values resulted in
more precision than defined, but the overall length did not reach the
predefined length.

This does not change the behavior of the original intention of
f59e350d1733125055f1144f8b3b1b0a46f6d1ca to give the precision of number
formats precedence over precision defined in the column header, which is
debatable though because conflicts may silently change the field
definition.

(cherry picked from commit e65141e93a540fc9fb4343ee65a5a7da7e3b1769)

Plus comment translation.

Conflicts:
sc/source/ui/docshell/docsh8.cxx

Change-Id: I234c4bceaa1a6aadbd259cb8d9b6cb6f16bf91c2
Reviewed-on: https://gerrit.libreoffice.org/8806
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

fdo#75376: configure: disable LTO by default for MSVC too

MSVC 2010 LTO triggers some bug in painting Writer documents;
unfortunately it's not possible to put a VCVER check in there to enable
LTO by default only for MSVC2012 because the compiler detection actually
uses the ENABLE_LTO value.

Change-Id: I29ecdd552d8a8bbd673a844e6bf0c938a98825c2
(cherry picked from commit 0d8e3a145901ab0124d40d33a50e2de28dc0c8ab)
Reviewed-on: https://gerrit.libreoffice.org/8918
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>

Related: fdo#73544 change double quotation characters

Change-Id: I1603dfad68261c917532f88397305eef57356da6
(cherry picked from commit 20fb1bfc72e626251b435bcff2339e1e425c7130)
Reviewed-on: https://gerrit.libreoffice.org/8911
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

Resolves: fdo#73544 rename acor_ca to acor-ca-ES

some more investigation into why bare language
autocorrect files are accepted needed but this
is a reasonably safe backportable to 4-2 fix

Change-Id: Ia294219e3c9d98710c6727238cedc15b040b408d
(cherry picked from commit d80d7e52d25dde05c834c9e87dd6a253bf6fcfed)
Reviewed-on: https://gerrit.libreoffice.org/8910
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>

fdo#71729: Fill the range edit boxes after the table is fully initialized.

Otherwise the range formula expression would not be available yet.

(cherry picked from commit ffaaf35206b8f049bb9e9ffd7a85c8ebd758a21c)

Conflicts:
sc/source/ui/namedlg/namedlg.cxx

Change-Id: If9c5040366f9038e8094fd5448ca5e4ee2e73edd
Reviewed-on: https://gerrit.libreoffice.org/8896
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

WaE: -Werror=sign-compare

Change-Id: I160a760a13c8e5140d6df295a9dffd05cf5e7b81

fdo#70666 avoid only bad Graphite ligature replacement

Change-Id: Ibd42c70edbd8a5ca5eba34bcb92e801c8dc97ba0

fdo#70666 fix Graphite ligature replacement at line breaks

Change-Id: I5b7c149f7f419ba18bd2cc59f4e77a0b61280caa

Resolves: fdo#76930 explictly list common lang-independant template dir

(cherry picked from commit 6f48d0bb2d3f3b4e4d3e46d3a5cdeaa552df1933)

Change-Id: I50d8efe46fc2eb3dfe615ad1f6eb7ee03cdcd29a
Reviewed-on: https://gerrit.libreoffice.org/8909
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

fdo#69157 Apply object-in front selection on mouseUp

Before, all selection was recklessly replaced when you clicked something
else than a scaling handle (or the like).
It caused bug 69157.

But now, you can still drag the frame by gripping the interior one.
Btw, that the timer did not correctly start was because of the return
statement in the prior state.

Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6
Signed-off-by: Lennard Wasserthal <Wasserthal@nefkom.net>
Signed-off-by: Michael Stahl <mstahl@redhat.com>

Resolves: fdo#77174 crash with "New style from selection" with List

was coverity#1130423 Dereference null return value

(cherry picked from commit a434a8bfdd8b9323c8262edcd591641fe9ea8b19)

Change-Id: If6981a9654a114e34dad931381ea071d5169adc2
Reviewed-on: https://gerrit.libreoffice.org/8905
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

fdo#77229 EMF+ rendering: improve EmfPlusSetClipPath's CombineModeExclude case

This is still not perfect, but at least we now don't do the opposite of
what was asked.

Change-Id: I5e144c5ec2987902e65b2eb472259d9c39bbbd11
(cherry picked from commit c2af50eb6df396c957890a6b912b8f3185893551)
Reviewed-on: https://gerrit.libreoffice.org/8904
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

fdo#77140 embeddedobj: avoid unneeded conversion in ConvertBufferToFormat()

The primary reason is not performance: on export currently we loose some
EMF+ properties. While it would be good to fix all those problems one by
one, this is a small fix to avoid all kind of roundtrip problems in this
situation.

Change-Id: If5e1c1eabd8290f36b538e374c9707ae17097786
(cherry picked from commit 2a7fdf2a7bb7345c49c988dfd1fcdb41cebb8a1e)
Reviewed-on: https://gerrit.libreoffice.org/8903
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

liblo: We need to provide LibreOffice with fake command line args too.

Change-Id: I34f364e63f814921bfe88af7cdf4ff4cdf6745fa
Reviewed-on: https://gerrit.libreoffice.org/8894
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

hidpi: Forgotten rounding.

Change-Id: Ie790b40ac86708768f52084538aa08f99df7def6
Reviewed-on: https://gerrit.libreoffice.org/8895
Reviewed-by: Keith Curtis <keithcu@gmail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

fdo#75741: Re-implement CompileNameFormula for formula groups.

(cherry picked from commit 355baf573425165cbc1c789a6271eb29940e1f76)
(cherry picked from commit 615f6aa293a6da90da94e6e78828198ffbc0ca5e)

Conflicts:
sc/inc/document.hxx
sc/source/core/data/column4.cxx
sc/source/core/data/document10.cxx
sc/source/core/data/table7.cxx
sc/source/ui/docshell/docfunc.cxx
sc/source/ui/undo/undocell.cxx
sc/source/ui/unoobj/nameuno.cxx

Change-Id: I57e1e464ac5f7abc10ce5ea5752e036ddb6cf6d7
Reviewed-on: https://gerrit.libreoffice.org/8889
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

fdo#77059, hidpi: Increase the threshold of what DPI we consider hi-dpi.

Conflicts:
vcl/source/window/window.cxx

Change-Id: I79802df4c11b3543140672419d78b697848b7c36
Reviewed-on: https://gerrit.libreoffice.org/8892
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

coverity#708388 Uninitialized scalar field

Change-Id: Idaa2ec4863beb6be790022c3c66bc4a72e9bf626
(cherry picked from commit 409ebeb20d1ee4552ac21bd739ae4e25eaeb68d9)
Reviewed-on: https://gerrit.libreoffice.org/8891
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>

CVE-2014-0160 heartbeat

Change-Id: I00ee89f69d85010be5d3a537092349fa9eeb71c8
(cherry picked from commit 9af4ecd2b485ae4bba443eb0ec6f958fcc2e3619)

fdo#74787, rhbz#1072553: Fix deselection problems of template view

deselectItems() were added to make recent docs
view work, but it is unneccessary to
affect template view too.

(regression from 0314034d8b23d5b69399cfcdf6b2f2add73f9f47)

Conflicts:
sfx2/source/control/recentdocsview.cxx

Change-Id: I0c805774321939991e308e9c8c669604e81dbad5
Reviewed-on: https://gerrit.libreoffice.org/8490
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

Updated core
Project: translations 0f2b2fa37079cca17ca4d19ff8fa81233c2c950a

Updated core
Project: help 7d73db5cf05eb0cd0c01536667fc021367b0aa92

Updated core
Project: dictionaries a042ec0063d8f6976de5c28d12dd035b67142ad2

pivot: backport fixes

Change-Id: I105fedacc3a10fadeaf799899edf1205cc142035

pivot: duplicate data field handling

Change-Id: I3d367b8b638217f18143118df00324f21a0470f2

pivot: Apply changes made in "Data Field" and "Data Field Options"

Change-Id: If8560d47c5b4e64367c441237c1e38f964cf6825

Pivot dialog: Make it resemble the old dialog a bit.

No idea what is best here :-) - MSO is more like what it was before this
change, OTOH this layout looks more as the final pivot table, which (in my
eyes) makes it easier to use.

Conflicts:
sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui

Change-Id: I5acb8c151139688c71b06d07006499513a17bdb9

pivot layout dialog: remove SAL_OVERRIDE from destructors

Change-Id: Icdb048a2ad9c49308213c3bb57f540e4ff567593

pivot: new pivot table layout dialog

This commit adds a new pivot table layout dialog which was implemented
from scratch. Instead of custom controls this one uses list boxes
for field entries which greatly reduces the code. It also fixes
some visual and behaviour bugs and adds the possibility to edit the
"Data" field.

Conflicts:
sc/UIConfig_scalc.mk

Change-Id: I6c01252acee5a2e8910e40e65904504d00e03057

preserve selection if chart creation is cancelled, cp#1000052

Change-Id: Ia8edb3e4c55e1a52515a761a60c4b1a59c990e1c

typo from 6d81c8ee3eca3e49cb17f4fa3b6f5732f0facae8

Change-Id: I48694c4fc4ee709d8ca8b3bba2207c098533cde3

Find apr and serf libraries in --enable-dbgutil Windows build.

Change-Id: I06af5605ac5cf8606864b7c42527aa567571341a
(cherry picked from commit 702d79a3f8fd3c5e4b433195908317075c87ad9d)

Fix Windows build(external/coinmp)

This patch fixes the problem that a linker misses CoinMP.dll.
The problem will occurs when we use --enable-dbgutil option.

Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a
Reviewed-on: https://gerrit.libreoffice.org/8854
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
(cherry picked from commit cddbec75d402e260d6997ad69377346a8aa5774a)

coinmp: actually link the libraries

Several people named Chris report failures in the solver unit test, and
apparently the CoinMP libraries have loads of unresolved symbols
because they don't have NEEDED entries, i.e. were not linked properly;
let's see if this fixes it.

Change-Id: Id406e14b0805a458d608c23cb7c65d873b5ba2f0
Reviewed-on: https://gerrit.libreoffice.org/8850
Reviewed-by: Chris Laplante <mostthingsweb@gmail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 6731f6c36faf64ab4522f0ffe2045c794849fabe)

fdo#75772 Correct name of Outline Numbering dialog

Change-Id: I14ffe5a9135f0fc37f839a386f4dc63c5831b9d4
Reviewed-on: https://gerrit.libreoffice.org/8875
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

fdo#74823 RTF import: work around wrong table column width on invalid input

This scenario is not a valid one, Word doesn't handle it, either -- but
the old LO 3.4 parser did. So add minimal support for it to avoid
the regression.

(cherry picked from commit 0a215b9a980e68f899ad548f780bbe5a1fec8732)

Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx

Change-Id: Icc2e8d3bf314e9cadda57956668033aa6d092457
Reviewed-on: https://gerrit.libreoffice.org/8871
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

fdo#76298: sw: do not start up every OLE object on deletion

First check if it's actually a Chart embedded object; starting up
external processes on Windows for arbitrary OLEs is likely expensive.

(regression from 1ba29be90f7141077f2d079d40dffc2efd4f1a2c)

(cherry picked from commit 206848294f686a0ccf4c741d7e92a2314a88ea48)

Conflicts:
sw/source/core/ole/ndole.cxx

Change-Id: I3c64444b6cf4d4f791cafc77ec1f9b2b0150ad1b
Reviewed-on: https://gerrit.libreoffice.org/8881
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

WMF import: restore support for the ImplReadDIB(bFileHeader=false) version

Regression from commit f7799c9317cc3187ae8aaedc36f829d478a59e77
(Resolves: #i124467# add check for image data offset..., 2014-03-28).

Change-Id: I71e78aefca2ca5b07f763ec798226b9bb39a5254
(cherry picked from commit 9984807f17593b97778fc31824c50706ea2e826c)
Reviewed-on: https://gerrit.libreoffice.org/8849
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Uploading libcdr-0.0.15: Support for CorelDraw x7

(cherry picked from commit 32f301f5a64d8ff7815cf88858fc8a87cb9ad76a)

Conflicts:
download.lst

Change-Id: I1cc6c6ab39ec27dbf08c2019c7dd7f8f29537520
Reviewed-on: https://gerrit.libreoffice.org/8845
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

accept proper number style condition != as not equal operator, fdo#76777

ODF 1.2 specifies '!=' as not equal operator in <number:number-style>
<style:map> style:condition attribute. So far '<>' is written, accept
the correct operator.

Change-Id: I6087992ee35fff5c7aa52b7cec2b83b0a78dbac1
(cherry picked from commit dfcc851d65c8d81988843ef31a75b5d30051ddfd)
Reviewed-on: https://gerrit.libreoffice.org/8834
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

bnc#821208 DOC import: fix unwanted char background in numbering char style

Word supports formatting the paragraph parker itself, and we import that
as a formatting at a position after the last character (e.g. "foo" will
have that formatting at char pos 3, which is ignored by the layout).

In addition to this hack, commit
1c22545edf9085b9f2656ca92781158b6b123db3 (Fix issue #i119405: Numbering
text style changed after importing the *.doc, 2012-08-24) added a
SwTxtNode::TryCharSetExpandToNum() hack to Writer core, where in case
such a paragraph marker attribute is set, and the SwTxtNode has a
numbering, then also modify the associated character style as well.

As that commit already noticed, there are attributes which should not be
propagated to that character style. Extend this blacklist to ignore
RES_CHRATR_BACKGROUND as well, as Word does.

Change-Id: Idcb40d37d8688c76fbd61f28428f6e3bc995f799
(cherry picked from commit 5a5d948e230dfea61108452579b68da75706cad4)
Reviewed-on: https://gerrit.libreoffice.org/8827
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>