Age | Commit message (Collapse) | Author |
|
We immediately cancel all the dialogs that potentially come up when using
LibreOfficeKit; which means that when you tried to save a .docx to a remote
server (which triggered the 'alien format' warning), the save operation
couldn't be completed.
Change-Id: I6bb5eadac994c1f515d7a49299c21960b3491bbe
|
|
The DBG_ASSERT followed by the same test actually returning immediately
prevents the actual 'search' after a 'search all' being performed.
I hope this does not have any negative consequences; but if it does, we should
fix the root cause, instead of having this kind of defensive programming here.
Change-Id: I909533f301dda9c20cab1968de45e5fa7975e852
|
|
Revert "bnc#584721: Import subtitle block to master slides"
This reverts commit b3d50feaa87b670baf68288974005ac26ad31736.
It seems the imported subtitle block makes export corrupt the
output. Better to have a valid output.
(cherry picked from commit a9db17aabc3ac970e6e4754e28310d20138144d9)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I1a3d4f03e4fa0c4431a5394495682a1b9d7677bc
Reviewed-on: https://gerrit.libreoffice.org/20921
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e18c062be49042945644db438608a6e58c7dc98a)
|
|
Change-Id: Ic6e0ed45b118b27a86f8657671ae877ce494c5d4
|
|
So the flag will be reset on early return as well.
(cherry picked from commit 6372080cd396a7e8608806a35a1be68d288b8fda)
Conflicts:
sd/source/ui/view/Outliner.cxx
Change-Id: Ib086ec4a02dda291a0291a8ac40660c16de0fbf6
|
|
Given that the edit/outliner views can come and go, avoid the lifecycle
problems with just passing a pointer to the sdr model to editeng, and
then it'll always have the up to date "are we searching" information.
editeng can't depend on svx, so provide an interface class SdrModel can
implement.
(cherry picked from commit 7b5d20983dfbfb458898eeab54828ba5fef5841f)
Conflicts:
editeng/source/editeng/editview.cxx
editeng/source/editeng/impedit.cxx
include/editeng/outliner.hxx
sd/qa/unit/tiledrendering/tiledrendering.cxx
svx/source/svdraw/svdedxv.cxx
sw/inc/PostItMgr.hxx
sw/source/uibase/docvw/PostItMgr.cxx
sw/source/uibase/docvw/SidebarWin.cxx
Change-Id: I3b98011593b00ac0fab05b6b9c591dd20d94c579
|
|
But they do cause annoying flashing.
(cherry picked from commit b9565ef0a73c235cd1e14fce9031db6e9237c524)
Conflicts:
include/svx/svdmodel.hxx
svx/source/svdraw/svdmodel.cxx
Change-Id: Ic313a15429c5db98c5660a5274aa49e95dd217e5
|
|
Change-Id: I5a74dd60f61fc0fdb88f08383d579b14222aa55d
Reviewed-on: https://gerrit.libreoffice.org/21366
Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
Tested-by: Marco Cecchetti <mrcekets@gmail.com>
|
|
Support for text documents and presentations.
Added a command line option for gtktiledviewer:
--hide-page-shadow.
Reviewed on:
https://gerrit.libreoffice.org/21210
(cherry picked from commit 6b7d41094d06bbb4c248927d02318cf1b5faba0a)
Conflicts:
include/svx/svdpntv.hxx
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
svx/source/svdraw/svdpntv.cxx
Change-Id: I1e427693d7af40cb5731d1730ac5b7c486d45c29
|
|
Change-Id: I251d079d6362cf09d014623663cf9355a9c79a2e
(cherry picked from commit be343661b076f3f57e7eb9ca1a5a4d3529752b58)
|
|
warning: now table are skipped because current implementation is not
able to iterate through table cells and when a match occurs on the first
cell the text object iterator stops working;
Change-Id: I36ca4dabe88b0eb8fd89d3fe3dcc6951e5c03d0e
Reviewed-on: https://gerrit.libreoffice.org/21166
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
|
|
In the tiled rendering case the map mode is disabled,
and conversion pixel to logical is not computed.
Change-Id: I0d54aaa897f0fe0df6e8b55334053dc66b6ea925
Reviewed-on: https://gerrit.libreoffice.org/20912
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
|
|
When LOOL requires to insert a graphic, it uses UNO command ".uno:InsertGraphic",
and the corresponding URL file image argument.
However Impress, ignores URL file image argument, and by default
pop up a dialog, so no image is inserted in LOOL.
Change-Id: I31dd1b1536307ef2dbb6b3d49812b310560c919f
|
|
Change-Id: I4b7422eb77edd39a2c6bd427aa8c10d62b1e370d
|
|
Added a unit test for testing that text decorations are exported
correctly.
Change-Id: I2bd71974242a0007726fbdd5ef5637a9ec62fd47
Reviewed-on: https://gerrit.libreoffice.org/19870
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
Change-Id: Iafeaecad612b724c4eeb85e0c01c942afb6445d8
|
|
1) Write endParaRPr so that PowerPoint display them properly.
2) Original design forbid properites with default value to be exprted, now fixed.
3) Automatic colors are written as white or black based on
whether background is dark.
Note that tdf#77881,tdf#80520,tdf#89525 depend on this.
Change-Id: I255c16f35149b738be2daf2800b1c90389f2c7cf
Reviewed-on: https://gerrit.libreoffice.org/17472
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/19862
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 0b5e3885bc706ed02acac1c682c90171700b0cac)
|
|
(cherry picked from commit 479325dec83ea2747f3ce27ca7e817695b15e1bb)
Conflicts:
sc/inc/docuno.hxx
sd/source/ui/inc/unomodel.hxx
sw/inc/unotxdoc.hxx
Change-Id: I9a6a75457078dc6383673f4c1a2012b69b5cefdd
|
|
Change-Id: I9e48407f6f5eb5cc4c36439b72648bb8d43deb79
|
|
Reviewed-on: https://gerrit.libreoffice.org/19883
Reviewed-by: Andrzej Hunt <andrzej@ahunt.org>
Tested-by: Andrzej Hunt <andrzej@ahunt.org>
(cherry picked from commit 81b8ca683d44ba9c37f2dc8c74470a86ce70513f)
Conflicts:
sc/inc/docuno.hxx
sd/source/ui/inc/unomodel.hxx
sw/inc/unotxdoc.hxx
Change-Id: I8d1f63208baf277b0a9d15908f3ea7ff3b56bf10
|
|
This helps ensure that images are swapped in when we actually
render tiles. Previously we'd sometimes have placeholders
instead of the image, which results in either an invalidate
(+rerender of that tile) once the image is swapped in (for
normal tiles) or a permanently missing image in the preview tiles.
Change-Id: I1a16a913faf9fad20e40a5d1aad3de187038c7a2
Reviewed-on: https://gerrit.libreoffice.org/19890
Reviewed-by: Andrzej Hunt <andrzej@ahunt.org>
Tested-by: Andrzej Hunt <andrzej@ahunt.org>
|
|
Change-Id: Icdb7d1cc250640f428984b96b0a51ac950013cb2
(cherry picked from commit 0c39c456f47c14e2b7f86d1bc6857dc0e2ca6cb3)
Reviewed-on: https://gerrit.libreoffice.org/19814
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit f318e585265fe5b863bd9927f5aad415ba060173)
|
|
the index variable m_FrameList used to reference the current frame uses
the state EMTY_FRAMELIST to mark as invalid, which is the max integer
number. Thus all usages have to be secured to not use m_FrameList
if set to EMPTY_FRAMELIST. This was missing in some places.
the max integer
number. Thus all usages have to be secured to not use m_FrameList
if set to EMPTY_FRAMELIST. This was missing in some places.
Reviewed-on: https://gerrit.libreoffice.org/19753
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Cherry-picked from f0cef70cd4164342b218fbee34bf57eedc22c998
Change-Id: Ie1cf4ae2cb79d821f634ec78b621a2647abc61a8
Reviewed-on: https://gerrit.libreoffice.org/19787
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 6b3b080f8cedc1b496022b18e477af0c7361fba3)
|
|
It's cleaner to let the apps do this themselves than exposing their
underlying vcl::Window.
(cherry picked from commit bfd79be417358822023691cf7b7b2946906100ca)
Conflicts:
sc/inc/docuno.hxx
sd/source/ui/inc/unomodel.hxx
sw/inc/unotxdoc.hxx
Change-Id: Iff2442dd325fa65a0cf3ad4aa7f918542dab1e4c
|
|
Don't disable "Insert table" option in case of Ole object
Change-Id: Ibe87d35db320f4a9d5c971e3f7b25199fcacbde4
Reviewed-on: https://gerrit.libreoffice.org/18897
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 2135b4a88d755c0b79a3b93b2269f08b709220c5)
Reviewed-on: https://gerrit.libreoffice.org/19067
(cherry picked from commit 53b8f63d0a8a8d1f99e2f4bf20934cf52c2b6bcd)
|
|
Change-Id: Ie6de4342b0e6f76076717f1fbdb18adf453ce963
|
|
(cherry picked from commit b08546eb23aa8dfc2f139731f800031f147e32d7)
Conflicts:
sd/source/ui/inc/unomodel.hxx
Change-Id: I528ac9f9f687d2940c6477b1d33264f1e523051f
|
|
(cherry picked from commit 8522948ba2f30fb703d4725086d30d9aa2a0cf4c)
Conflicts:
sd/source/ui/inc/unomodel.hxx
Change-Id: I8bc7316d9304d9e764ee846fe3af34599bf6fc35
|
|
regression from
commit c72fac269626cd4c2c3f62a6eed69e47b59256a4
Date: Mon Mar 16 12:17:44 2015 +0200
vclwidget: convert lots more sites to use VclPtr
Change-Id: Iac6a83003d9c395589acdc23fe511d2bb47e91ee
(cherry picked from commit 8e4739b94de0bbc7ceb91705a7ba7946b8b70b94)
Reviewed-on: https://gerrit.libreoffice.org/19497
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 847ac6ae8372aafc28e06f24009ac77572334486)
|
|
(cherry picked from commit cbe2b9cb69a685ab89384f98a9e62b2623afcd9b)
(cherry picked from commit 2b942719d7132b0e055395ad8efb0ee3c60676cf)
Change-Id: Ie6863f446aa688bc1bb3f725ee31e9984dadc7a4
Reviewed-on: https://gerrit.libreoffice.org/19466
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit c7f1f2274479fe926666dffe82fa322fe64a9f5c)
|
|
Change-Id: I24d29ffc3cfcb00e513a5267619e143b028355ce
(cherry picked from commit 6c39f7bba64fd55488f840675fa83c3ba241bc74)
Reviewed-on: https://gerrit.libreoffice.org/19468
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 22c83fc1f7a2d2e6fd5ec1262b14e32a28fb2eae)
|
|
Reviewed-on: https://gerrit.libreoffice.org/17476
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
(cherry picked from commit 525b1c2c86898b4f7b53d887d4b6ab4c843f22ae)
Conflicts:
sc/uiconfig/scalc/toolbar/standardbar.xml
sd/uiconfig/sdraw/toolbar/standardbar.xml
sd/uiconfig/simpress/toolbar/standardbar.xml
sw/uiconfig/swriter/toolbar/standardbar.xml
Change-Id: I175d27311fa166d3d33f2d88184b1fcd01f5df6a
|
|
Change-Id: I296ce6233287dac5447462faa4b7404c25297f8b
(cherry picked from commit 87297284782adbf1fcb73663ad2d2a38b5ae1872)
|
|
(cherry picked from commit 3080e4c09b7c4894d4f0f52c9beed4298f3fd23f)
(cherry picked from commit fedf965c51a9f57e5cde203a3d15a6c244558002)
(cherry picked from commit 4c2339d8177d610cc23619e787c1517ce8e8afd7)
(cherry picked from commit 1bc911eca173131fdc6e7e3889d128fa03adbf72)
Conflicts:
framework/source/uielement/menubarmanager.cxx
sc/uiconfig/scalc/menubar/menubar.xml
sd/uiconfig/simpress/menubar/menubar.xml
sw/uiconfig/swriter/menubar/menubar.xml
Change-Id: Ib6578ddd7897d9c5d63b5dc8d8465f6107cc24a6
Reviewed-on: https://gerrit.libreoffice.org/19345
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit be6440f4624be4da84ac8b71e66297d3e43ca249)
|
|
ODF 1.2 part 3, 18.3.1 angle, says "An angle, as defined in §4.1 of
[SVG]" and "If no unit identifier is specified, the value is assumed to
be in degrees."
Unfortunately OOo could only read and write 10th of degree here.
See also https://issues.oasis-open.org/browse/OFFICE-3774
As the first step towards fixing that, implement the import for
draw:angle values with an angle unit identifier, but leave the import
as-is if the angle identifier is missing.
Change-Id: Ib88d417c03998ebcfc569b01492f0e1f851bbc85
(cherry picked from commit aadda5d17f6e422da143ea774f759bfc5f629c5b)
Reviewed-on: https://gerrit.libreoffice.org/19283
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 76a4665a09542fb67dd99c9a607c162e0b678ead)
|
|
The fix is twofold:
1.Get URL property from the underlying text field, not from the
text run -- put text field properties into rXPropSet (that's
what GETA macro later queries), not into rRun
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 does s/rXPropSet/rRun/
afaics for no good reason
2. Retrieve string content from URL field early, so that the test
for empty text content doesn't fire
Reviewed-on: https://gerrit.libreoffice.org/18031
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Conflicts:
sd/qa/unit/export-tests.cxx
Change-Id: I4317e4a2f6f2e6f15c30932adc80f1227e010af0
Reviewed-on: https://gerrit.libreoffice.org/18706
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e17187c323428b7edea425278ea33bca77db12b5)
|
|
this is presumably a regression from
commit 8904bf48e0cb4d5d0890684ce82dc2ff3252e41f
Author: Michael Stahl <mstahl@redhat.com>
Date: Tue Jul 7 23:57:07 2015 +0200
sd: dispose SdStyleSheet properly
If it's disposed during document destruction it still retained pointers
to SfxItemSet and SfxStyleSheetBasePool.
where it was always deleted in the dtor, but now
is optional in ::dispose
lets set bMySet to true when pSet is created like sc does, rather
try going to an unconditional delete in ::dispose
Change-Id: I214675805e513f657e51c779758106194f6d14e3
(cherry picked from commit 217a22188274221035aec988eccea5e5c9768921)
Reviewed-on: https://gerrit.libreoffice.org/18694
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 31d1004f00624a1d755914ad8313992abb9545a9)
|
|
(cherry picked from commit 7af19f45b35c428d3e06972806e5a05489f45955)
if nSize was 1 with unicode encoding
nSize would wrap around in lcl_getMaxSafeStrLen
(cherry picked from commit f6368c29bdc3a9017bcae3f064d2cd8c7e37ed10)
rework this so we don't read the string, backup and re-read the string again
(cherry picked from commit 8523e57e427ef5b0b7f7067dcdd07f01176d2160)
Change-Id: I99f3d4a2ec760228f485d01fce856deb9c068431
Reviewed-on: https://gerrit.libreoffice.org/18690
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 642779743f74edcaa4e69a722ea07918ee79c592)
|
|
Change-Id: I4ee52c76b2c1723639185bc99b85d83be5b4fdd7
(cherry picked from commit 637ad743bb74a826ddd4db5efbcd33779b9132cd)
Reviewed-on: https://gerrit.libreoffice.org/18686
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 301391a6d1257d345ca4df19bfd35d2eefe7f9aa)
|
|
(cherry picked from commit d8bc93ef118c75f48685d5f6d121ad7eabf2a80c)
Conflicts:
sd/source/ui/view/Outliner.cxx
Change-Id: Ib6be973bf7c911907c793571b84021dc317dcc80
|
|
Change-Id: I607b3719e0f508f9ae24db7482323847aa8e2491
(cherry picked from commit 6a35a75a6bb2753f40edf59f360130e452b3c7f0)
|
|
The LOK API can describe a multi-selection, so find-all can signal all
matches, editeng can have a single selection only. Instead of having no
selections after a find-all, select the first match, so e.g. copy works.
Change-Id: I0eab2565916f0c3cce5d77279c0d927ad4b7054c
(cherry picked from commit cd4976988cf3acb4f1a23f1df7fcc2bfec0f3da0)
|
|
For one, if sd::Outliner::RememberStartPosition() cares about storing
the current selection in the DrawViewShell case in maStartSelection,
then sd::Outliner::RestoreStartPosition() should probably restore it.
For another, sd::Outliner::StartSearchAndReplace() returned true in the
"nothing was found" case, which restarted the spellchecking, which
killed the selection. If the selection has been restored already, then
at least don't kill it in the find case: find is read-only, so no need
to restart the spellchecker.
Change-Id: Idd886d449a9cfb164887fc6b1fde27b5e63e272b
(cherry picked from commit aa8f218079e2d311927d8aaf64b03b234453fb11)
|
|
Without that, the result in Calc/Impress is ambiguous.
Change-Id: I8dfd8dafc996102ed583688fddd721c7600dc48c
(cherry picked from commit ad280b67f8fda8f832a6a83bc5665df448c6ad00)
|
|
Change-Id: I88865db539779bc401550d7b4a3729b89d7e18b1
(cherry picked from commit dd1fc2242a64a0b9ae8031a5edc7ecfcde4ec3df)
|
|
Change-Id: Icee3a07103fad1bf70637fbf23299f50b7ad838d
(cherry picked from commit 32d573cdd13126c13e46b4e3684446e888e8b8e6)
|
|
Change-Id: I8a2fcaad5806ef204cdac0f6eaac615d50d6d9e8
(cherry picked from commit 28a5d4b5d3641837f3be8bc39ead111f9bba7015)
|
|
Given that sd doesn't support find-all yet, this works for normal find
only at the moment (so it may report multiple rectangles, but always a
single match).
Change-Id: I47bd0d0161b9d1dc843bb503f5521f311fc158c4
(cherry picked from commit 395cfab05752b87ae419304789d894c0fe9a98c2)
|
|
It turns out a full invalidation is still needed to trigger the loading
of graphics on the new page, so instead of not invalidating just don't
emit the notification about it during page switch.
Change-Id: Ic99a3d4e268b3db61cf09c78ed0f310c9d365867
(cherry picked from commit 1631fa9a722553da1ebe0650a65e859862c4405d)
|
|
In case of tiled rendering clients already get LOK_CALLBACK_SET_PART
when switching slides, so it's pointless to additionally invalidate
windows for help lines.
Change-Id: Ibc15c9862ae85bd72328161fa5f7e72d82fd2a97
(cherry picked from commit ca3436723455a0d0f3ced6f33b646b7c79ab05a1)
|