Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts:
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
Change-Id: Ie150588e6d930bd33cee935fa962a57ecf966a93
|
|
Change-Id: I1d24b2039fb3c615e672189d12c77e960cc858ee
|
|
Change-Id: I4520eea08e43ccd657c1db03b258ef84612da971
Reviewed-on: https://gerrit.libreoffice.org/7726
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 8d1ca883b119857daa3b8d0ece9da90917589040)
|
|
Change-Id: I0abf1bbb790ec47e881bccc861b366460add3a99
|
|
Change-Id: Ie1e528f6a203237818432b182da8e929ccf2e45e
|
|
because MSP patch cannot rename directories, and MSP installed over
the older base would result in immediate crash if Python cannot find
its libs. Version number is hard coded in PYTHONPATH.
Change-Id: Ib90ba3ab6f19a89f1ab2ae6fbc0aad9365d3645d
|
|
Change-Id: I06bcf0d2cc8c4915eff3658905087be6a2eadca6
|
|
Change-Id: I69268d78c13299ddba6867dc599295ef9dcd3fe3
|
|
- drop obsolete/upstreamed patches:
python-3.3.0-ffi-clang.patch.1
python-3.3.0-15833.patch.1
one hunk of python-3.3.0-aix.patch.1 in fficonfig.py.in
Reviewed-on: https://gerrit.libreoffice.org/7278
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 45c537a1185dfca7e51229dde9e9220e5174bd57)
Conflicts:
external/python3/python-3.3.0-aix.patch.1
external/python3/python-3.3.0-elf-rpath.patch.1
external/python3/python-3.3.3-aix.patch.1
external/python3/python-3.3.3-elf-rpath.patch.1
python3/ExternalPackage_python3.mk
python3/UnpackedTarball_python3.mk
python3/python-3.3.0-15833.patch.1
python3/python-3.3.0-aix.patch.1
python3/python-3.3.0-elf-rpath.patch.1
python3/python-3.3.0-ffi-clang.patch.1
Reviewed-on: https://gerrit.libreoffice.org/7290
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
download.lst
python3/ExternalPackage_python3.mk
python3/UnpackedTarball_python3.mk
python3/python-3.3.3-aix.patch.1
python3/python-3.3.3-elf-rpath.patch.1
Change-Id: I12f0f78a172067986b63455847015ea2430a084c
|
|
|
|
|
|
Unless the value is reset - the escapement
seems to continue to the next set of textruns.
|
|
Ported from: 840a8573c8cebe67ddd3c9fe106c7dbd789bb334
(Original Author: Thorsten)
|
|
Seems like the status is returned as default,
but the font properties needs to be still exported.
|
|
|
|
|
|
|
|
|
|
|
|
Otherwise (i.e. with non-vertical lines) the width will be incorrect,
and can result in lines disappearing as the resulting X component
can be tiny/approaching zero.
(cherry picked from commit 83f2b3c590120a60b5e94fb1a15054ebe0745dbb)
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: Icf3b7c10c627594600b517b8ff445f8df87c56f8
|
|
Change-Id: I5b369703333332598353d9817f0253bbe5fc3601
(cherry picked from commit 9b1ceabd5f696500d4fe2acb89170bd987966a9b)
|
|
Change-Id: I5babcec50d48dc2a6288a01685db61fbb7058680
(cherry picked from commit d8dedc775cedf0e9daf9284bc7e3a0331ccd2963)
|
|
It seems pAction may be NULL so let's keep on to check it.
Change-Id: Ie1a48c96bfa930364053c7c3ad0c940559544e33
(cherry picked from commit ebe616de53b98e419c39782c6615877a12f0edc7)
|
|
Change-Id: I4144e94cc3c1a3e068e0f9bca4b73e5c63a9274a
|
|
Change-Id: I7b53a8f18e1fb24b1ae0322bdf0980e431a0725f
(cherry picked from commit 131f3230d98f24faf57d9404e333cb1fb183345b)
|
|
Without this the drawinglayer renderer is used, whereas
only the canvas renderer supports EMF+.
Change-Id: Id8a10e400e08c1913e7d6864a51f7b73fc9be437
(cherry picked from commit be7d87bea2611eb316b9b379aebc031179d4f794)
|
|
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: I4f861c7653c89d8f1ca73696e885f33f7bfc3b06
|
|
Change-Id: I5c3903a40b69867684707d33acbc92b1f80a93ec
|
|
No idea why that was not allowed (since the initial import in 2000), we need
it for interoperability.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
sw/source/core/doc/docredln.cxx
Change-Id: I475fa63f9a4a3219a2b898b6f7d81e0603d32c18
|
|
Change-Id: I6043ee3c214f453afaef06125993c73be624c07e
|
|
Change-Id: I6a3f563b6effd37b448ec3e8463a87879e0566d4
|
|
Contains the following commits:
* EMF+: Small cleanup & more logging in preparation for line starts & ends.
* EMF+: Parse custom line cap data for start and end line caps.
* EMF+: Render custom line cap data.
* EMF+: Set the stroke attributes on the custom line caps.
Change-Id: If35ef1c44f34f5d5e6c50789c907105d03e96fca
|
|
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: I9eb21c0a8b5baa5b0080845f61b12fc65034d959
|
|
Turns out that for the WMF, we already had everything set up correctly, we
were just overwriting the right settings with default data again :-) - fix
that.
Includes the following commits:
* Revert "wmf-mm-text-1.diff: Fix WMF rendering, n#417818"
* Revert "wmf-mm-text.diff: Fix WMF rendering, n#417818"
* fdo#56886 EMF: Fixes some scaling problems of clipped regions, Twips
Change-Id: I14b0c12b10f58eb7031f9da712dee76344c75159
|
|
Conflicts:
cppcanvas/source/mtfrenderer/emfplus.cxx
Change-Id: I7221311e5dee6384dc2d1c071bf6f1c61811895a
|
|
Change-Id: I4dbe9145466d6d93ebd3dea7f4fe434c9ee3de19
(cherry picked from commit cdd351b1487a8a97f481a9165d9cd361aaee2ca4)
Reviewed-on: https://gerrit.libreoffice.org/6655
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
|
|
This improves the situation, because previously, the document would just crash
due to infinite recursion.
Deeper checking why do we end up with an invalid range would be good; but it
was impossible to check with the bugdoc, as it was too complex, and trying to
cut it down was crashing MSO :-) Hopefully we'll get a better document at
some stage.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I4cd639e02aebe9027f06e8468c14969c506327b2
|
|
Change-Id: I68fb6ed2b2bdf7ee99062f7af0c677ca9725e1b8
|
|
Change-Id: Ie8beb4b788b652522415d21ce432dcf48fa7327a
|
|
Change-Id: I45e4f2a1246d9f721b549e0196e766aa5e3e03af
|
|
Change-Id: Id169b462d4a132f05c665227ee949b8ebf2be00d
|
|
Change-Id: Ib7d0a34ddaefde6662cc98eae63a79e8ef671986
|
|
Change-Id: I6980b65d1d5829f2808e5f43edf96b8472596ab3
|
|
Change-Id: I2ced784f302ab7011f496470cfa19e67e6f8ed3e
|
|
doc start
In theory, it was a problem to have the table cursor around when having
the selection outside the table; but it didn't cause a problem so far.
However, when the table has one or more empty cells, we really need to
leave table mode, otherwise only the table gets selected.
Change-Id: I766903ed624b9338f0612697b4c03f44de1d2e41
(cherry picked from commit d1eb536c7e410d40fd94c76b157bbd4ed7944d4c)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
|
|
It turns out, normal Ctrl-A doesn't select headers, footers and fly
content, either (just like not selecting footnotes). So do the same when
in the "doc starts with table" special mode.
Change-Id: Ib9bc397944a4d07ea03bc326f1536733c57f42e6
(cherry picked from commit 232df42b8dc0b4f7a335d2931fc0f29e73b8bca0)
Conflicts:
sw/qa/extras/odfimport/odfimport.cxx
sw/source/core/crsr/crsrsh.cxx
|
|
footnotes
ExtendedSelectAll() was originally invented to e.g. select the whole
document, change the language of the selection and then inmediately
(before the layout is updated) undo the selection.
When using it for "select all and doc starts with a table" purposes,
then footnotes shouldn't be selected, just like those are not selected
either, when the doc starts with a normal paragraph. Their anchor is
still selected, and that's enough to have correct delete and copy&paste.
Change-Id: I4fc49db628054a4b8a46effc2d0328eaabcaa9f8
(cherry picked from commit 959711f1276106b0aaee69ab660f1b0d3ece5bbc)
Conflicts:
sw/source/core/crsr/crsrsh.cxx
sw/source/core/edit/eddel.cxx
|
|
OUString::number() -> OUString::valueOf()
|
|
|