Age | Commit message (Collapse) | Author | Files | Lines |
|
the master page is not the sole owner. Which happens when copying
and pasting slides which bring along a duplicate master page to
an already existing one, and the attempt to remove the duplicate
strips the fill properties from the shared stylesheet in use by
the other
regression from...
commit b876bbe2cacce8af379b10d82da6c7e7d229b361
Author: David Tardon <dtardon@redhat.com>
Date: Tue Apr 26 09:17:11 2016 +0200
rbhz#1326602 avoid exp. bg bitmaps from deleted slides
(cherry picked from commit de4908eb4d2f1f2ce38a37eea18a9efc4a0073b1)
Reviewed-on: https://gerrit.libreoffice.org/26976
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit fad4d7877ac8d04ab82e8acd21205f315d6eab1f)
Change-Id: I91fb8f622a0e35741ecc37cef14fc93199bb730b
|
|
This fixes CppunitTest_sw_tiledrendering in the LOK_VIEW_CALLBACK=1
case.
Reviewed-on: https://gerrit.libreoffice.org/26313
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit c97422fa103618ba19bde0d815674a0173058bb4)
Change-Id: Ib79e57908c3edda0154341baba8279ede4281a42
|
|
To fix table shape selections.
Reviewed-on: https://gerrit.libreoffice.org/26242
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 75f4372dd6a7ff1a1029231a6e3959bfe84f6445)
Change-Id: I85810c20b8cc51646d3c8a8b974d0e8a4f96d1ae
|
|
Given that the per-view callback is in SfxViewShell, and editeng doesn't
depend on sfx2, add an interface class in editeng to invert the
dependency.
With this, gtktiledviewer no longer crashes when starting editeng text
edit with per-view callbacks.
Change-Id: I783cdc646b890a6b597000f1d88428c8042417cf
Reviewed-on: https://gerrit.libreoffice.org/26169
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 89bbd0ecbf18a1e9030e49443fa15d068b19f767)
|
|
They should invoke SfxViewShell::libreOfficeKitViewCallback() instead.
Change-Id: Ie7150e9decb40de917a5257aa4090595bdc5e387
Reviewed-on: https://gerrit.libreoffice.org/26108
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 5fd43512c37ed5c3937b94d0a8d53d7e9c2ac0d1)
|
|
As all callback invocations happen with SdrModel's callback pointer.
(cherry picked from commit 7073d20627ccfcdd705b53f9d8bc4b58fab9e82a)
Change-Id: I0111040c501b7927332f88cc4797b8ebab2bc57a
|
|
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit a238b1f8d304bf1e2ffb357937f3ec888ee8ac89)
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
|
|
(cherry picked from commit fb7edcd806aad98ad61e60b4165771ca3ae13ef3)
Change-Id: Ie8e33d075f0cedbb9f7148717c4318f4494ed419
|
|
Handle multiple views when clicking on a graphic, and thus sending a
"text selection is now empty" callback. This avoids an assert when
clicking on a Writer image in gtktiledviewer.
Change-Id: I2b6d7e561ccc4a6e0782fdad37d4b104c08f1eeb
Reviewed-on: https://gerrit.libreoffice.org/26152
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 213b15fa59ce768086c41dbcdc5c29109a09ad9d)
|
|
are actually pointer vars.
Also convert from regex to normal code, so we can enable this
plugin all the time.
Reviewed-on: https://gerrit.libreoffice.org/24391
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit e8fd5a07eca70912ddee45aaa34d434809b59fb7)
Change-Id: Ie36a25ecba61c18f99c77c77646d6459a443cbd1
|
|
This is the last callback that was unconditionally invoked on the model
on load, before the SfxBindings timer starts.
Change-Id: Id494963459ac2bee4d0f9e642af88e04e94353c3
Reviewed-on: https://gerrit.libreoffice.org/26129
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 901026cfbbf12f778e039a7b523bf30e8019e8ed)
|
|
With this, selecting an image sends the selection callback only to the
relevant view.
Change-Id: I0d5d611b969715d8eafa8d813202984acff32fbd
Reviewed-on: https://gerrit.libreoffice.org/26112
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit ce90a3cb3dcf35d8b7dbf886b62bb3ebc2c1ebef)
|
|
So that it's possible to assert the layout from cppunit tests.
Reviewed-on: https://gerrit.libreoffice.org/26054
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit a106165e7fd39215c4717e1486aef05f6af9180f)
Change-Id: I09631f978ed44bb1c27806089b6d69c70db643c3
|
|
Change-Id: I3d56ccf967c18ae02f4c176e4898df058771c87d
|
|
Reviewed-on: https://gerrit.libreoffice.org/25489
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 28795d0faabd1e1be124fa90bef06d7f47a63311)
Change-Id: I2f0bf28e87f4188abd81eb6c42bae915b2a046a8
Reviewed-on: https://gerrit.libreoffice.org/25490
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 33d4f7e5624d77ef1ce51aece1c8a0ef7ea21603)
|
|
Mutex belonged to DisposeListenerGridBridge which inherits from
FmXDisposeListener, FmXDisposeListener dtor accesses a reference
to the parent mutex in its dtor, but the mutex has been destroyed
at this point.
Move the mutex from parent to child. FWIW these classes are on
the candidate list to merge.
(cherry picked from commit e841ed93d6c6d817be1f7fdc18ff971325c861cc)
(cherry picked from commit 1c0d1199fe02666de0d162f071ce7e6e812a23df)
Change-Id: Ic639eaed97c2b0625c368ed249f09920af37f94e
Reviewed-on: https://gerrit.libreoffice.org/26382
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 51192fa69388df69a7a5d8f03fec53de61b69050)
|
|
Change-Id: Ic07722c3e1f75d909ec8f123919a1898dfde05b0
(cherry picked from commit 99b8598495ba76e8fd32af2ace17e0b29b3beffd)
|
|
Change-Id: I40a53cf08e2a789299cd7a05d531b4f920653989
(cherry picked from commit 97c872d015350810fb0180ffdb10de7f039363a4)
|
|
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)
Change-Id: I3b98011593b00ac0fab05b6b9c591dd20d94c579
|
|
But they do cause annoying flashing.
Change-Id: Ic313a15429c5db98c5660a5274aa49e95dd217e5
(cherry picked from commit b9565ef0a73c235cd1e14fce9031db6e9237c524)
|
|
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)
Change-Id: I1e427693d7af40cb5731d1730ac5b7c486d45c29
|
|
But don't bother shipping it on OS X, at least not in the sandboxed
(App Store) case.
(cherry picked from commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5)
Conflicts:
Makefile.in
Repository.mk
Conflicts:
Makefile.in
(cherry picked from commit ff489b6161654d378c70ed5e3f6be82e24ec09c9)
Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
|
|
I doubt end-users will miss gengal.bin, regview, or regmerge.
(cherry picked from commit beb30bbd867f9a28878e0d004458c3507f6c0956)
Conflicts:
Repository.mk
(cherry picked from commit 72e8d549fae0aa6278a6b2d64cf65d4df8f27f94)
Change-Id: I353610c0d039f25fa415f35902fe2b9890cd423f
|
|
SdrTableObjImpl::LayoutTable() assumed no re-layout is needed in case
the total width of the table and the number of columns is the same, but
undo of resize is a situation where we also need to check the individual
widths of the columns, otherwise layout won't be up to date.
(cherry picked from commits a106165e7fd39215c4717e1486aef05f6af9180f and
9cea9137b2534da4056f72d3c8a07f85a02f85be)
Conflicts:
sd/qa/unit/tiledrendering/tiledrendering.cxx
Change-Id: Ia5ebb05af79dda1c0d8c5bb10e7f37f81ee1d035
Reviewed-on: https://gerrit.libreoffice.org/26072
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 0525de4392491aa267c719dda09e3a068cdb413d)
|
|
1) OBoundControlModel: when reload() asks us to connect to database column,
redo it even if it was previously done.
2) FmXGridPeer: when getting Reloaded event that we subscribed to
(and specifically from frm::ODatabaseFrom), pass along the event
to all columns before we treat it. The columns (controls) are
themselves subscribed to it, but they may get the event after us,
which means our treatment still uses stale data, which we continue
to display.
The column controls should continue to subscribe by themselves for
the case that they are not in a grid, but direct children of the
form.
Change-Id: I0cbcf2dc792e8650157a69ddc414d755de0e549a
Reviewed-on: https://gerrit.libreoffice.org/25549
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
|
|
like the other methods, so fix it in canCopyCellText + copyCellText
Change-Id: I3395f8823602f0a1791908945e3dec5034d3d612
Reviewed-on: https://gerrit.libreoffice.org/25605
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit 634fd0016ef7396a782d28272852302841f37201)
Reviewed-on: https://gerrit.libreoffice.org/25622
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
During ODF import using API for CustomShapes Outliners and
VirtualDevioces get created and not destroyed due to referencing.
This makes the ressources blow up, even under 64bit windows.
Also see tdf#93994 where this was already fixed on page base,
but this is not sufficient for this case.
Reviewed-on: https://gerrit.libreoffice.org/24305
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
(cherry picked from commit e6adb3e8b4de3c0f78d249b83de19b849ef65b59)
Change-Id: If9b37d341fcfa4e65485c54054d47964ee2fff5f
Reviewed-on: https://gerrit.libreoffice.org/24843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I309e1e5f0d28c408c8a95190bf645abf680491b6
(cherry picked from commit 097bf754c09e8b1ba57e3367baa010898611b61b)
Reviewed-on: https://gerrit.libreoffice.org/24794
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Highlight color isn't implemented for cells,
so this button isn't going to work.
(cherry picked from commit 36d68e49255d5fc2ded3c5a4aaa91b718122044d)
Change-Id: If52d000ac80eb05c4f65cc42092ba91b9bb752c7
Reviewed-on: https://gerrit.libreoffice.org/24800
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
|
|
This corrects some errors in converting old kind dialog to
glade. Separator items are count too, but were not considered.
Therefore button and action were not sync. Two RADIOCHECK and
CHECKABLE were wrong.
Change-Id: Ie2c2f2febe7f7264fd08b8847dc72c3ee8d49a8c
Reviewed-on: https://gerrit.libreoffice.org/24684
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit b8528dcb9c0c5ee75742df3c0e5ee9f373fbf154)
Reviewed-on: https://gerrit.libreoffice.org/24795
|
|
ODF export uses SvxUnoBitmapTable (impl. of
com.sun.star.drawing.BitmapTable) to create fill bitmap styles. That
returns all XATTR_FILLBITMAP items that are in the document's pool. So
we ensure that bitmaps that are only used on deleted (either explicitly
or by undoing their insertion) slides are not in the pool.
(cherry picked from commit b876bbe2cacce8af379b10d82da6c7e7d229b361)
Change-Id: I54c594a94989158f22b156fe660c1e716b988b3e
Reviewed-on: https://gerrit.libreoffice.org/24590
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
The problem as seen by the user: if you have a table of 2 rows and 1 column,
and the separator line is dragged upwards by the mouse, then undo doesn't
restore the original situation.
Two items are created on the undo stack: sd::UndoGeoObject and
sdr::table::TableRowUndo. Let's say the table height is 8000 mm100 and the two
cell heights are 4000 and 4000. If the user resizes the first cell, so that its
height is 2000, then the new table height will be 6000. The problem is that
when undo is executed, first sd::UndoGeoObject resizes the table, distributing
the newly available 2000 between the existing rows, and then
sdr::table::TableRowUndo sets the row height of the first row: the height of
the second cell will be larger than expected. Fix the problem by not doing a
relayout during sd::UndoGeoObject, but doing a relayout after
sdr::table::TableRowUndo in this case.
This is done by:
1) Adding a new SdrDragStat::mbEndDragChangesLayout, so that
SdrTableObj::applySpecialDrag() can inform SdrDragObjOwn::EndSdrDrag() that
TableRowUndo will do the layout instead of UndoGeoObject. (This is done only in
case a row edge is dragged, as otherwise it's not guaranteed that a
TableRowUndo will follow the UndoGeoObject on the undo stack.)
2) Adding a new SdrUndoGeoObj::mbSkipChangeLayout, so that
SdrTableObj::applySpecialDrag() can let SdrUndoGeoObj::Undo() not do the
layout.
3) Adding a sdr::table::SdrTableObjImpl::mbSkipChangeLayout, so that
SdrUndoGeoObj::Undo() can let SdrTableObj::NbcSetLogicRect() not do the layout.
4) Marking the table model as modified in TableRowUndo::setData(), so it does
the layout at the end of the undo group.
(cherry picked from commits cafc53f8b4c08443524b1da6f4918d49afd45bb5,
8d1fa417bc49a9e9eee923e3ce6a37d7b0f056f1 and
758e6f39d96237881198818e3bac432012be61d8)
Conflicts:
sd/qa/unit/tiledrendering/tiledrendering.cxx
svx/source/table/svdotable.cxx
Change-Id: I8adde3cdad5741e6fcb420e333ce336e18c77cf1
Reviewed-on: https://gerrit.libreoffice.org/24392
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
Change-Id: I83e38c017600946e4055a5b8ada87a0f64e83222
(cherry picked from commit 84800b5e65e03c744b01225a1d44f8d54481b5f4)
Signed-off-by: David Tardon <dtardon@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/24410
Tested-by: Jenkins <ci@libreoffice.org>
|
|
All the table and cell objects know how to undo this change, what was
missing is the begin/end undo calls and the broadcast of the cell
format change.
(cherry picked from commits 3057b5cdb989d44613518900b25ebad8b7c600a2,
d60d70d92cec7bbc471f8f0c653d443282227d34,
6819992113947e7a6272bf750fee712c2df41905 and
100eb15b4d8529d7a11d98a28742f31f0f792fa1)
Conflicts:
sd/qa/unit/misc-tests.cxx
Change-Id: I3dfd203faf5c579da2937fedab5647129a8e903a
Reviewed-on: https://gerrit.libreoffice.org/24276
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
so long lines in them are clipped out in the preview.
Change-Id: I355986ff4a9c9e53f8e8f5d41b63f74c633f41ee
(cherry picked from commit 93efd7ebbad293d3729b8ea4b9726aff498f607f)
Reviewed-on: https://gerrit.libreoffice.org/23993
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
It's IMO a bit confusing to see a "graph" header that doesn't
strictly deal with graphs, but graphics.
Backporting to 5.1 series to allow for easier backporting of
other potential hotfixes.
Change-Id: Ic37c6cd78e23d05939486f98667144c4453bb0a3
Reviewed-on: https://gerrit.libreoffice.org/22949
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
isnan() not found causes compilation error
System: Archlinux (Kernel Version 4.4) - GCC 5.3.0
Change-Id: Id0bb4555428896678437e8abf228f1c208f1e7a0
Reviewed-on: https://gerrit.libreoffice.org/22695
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/22917
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
PageBackground is due to old constraints in exporters not completely
hindered when IsPageVisible() is already set for signalling that
all EditView-specific Page visualisations should be suppressed.
As long as these exporters are not adapted, use the setting of
SetPagePaintingAllowed() which consequently achieves this.
Change-Id: I2222a799533f763b54b2210a46c24aa8ae92d7a2
Reviewed-on: https://gerrit.libreoffice.org/22837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit f3ff67d3c3047de3ad43f8bb3f805d82eaef0479)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
... in order to set the row's min height
Regression from 4f2c8194f485b1527fb4f4dfe23ce804937f1f9c
After this commit, the row's min height was set based only on
the cells containing text in the row, but the problem appeared
when the row didn't have any cell with text.
Change logic to check wether there's text in the cell and in the row.
Now, height in SdImportTest::testRowHeight() is 507 instead of
508 but I can't figure it out why. However, I believe there's
no harm in change the test from 508 to 507 as, visually speaking,
the difference can't be distinguish.
Change-Id: I0b3a14c34eaeaa8e77227860ca290fb79a0302ce
Reviewed-on: https://gerrit.libreoffice.org/21692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
(cherry picked from commit 13d4398820ded5914f635757865e258db2db2b57)
Reviewed-on: https://gerrit.libreoffice.org/22008
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
|
|
Regression bug introduced by - https://gerrit.libreoffice.org/#/c/16165/ and removal of obsolete writer code.
Change-Id: I8ab2e0c04b5c90fafdb43f34899053df7bd7fb4e
Reviewed-on: https://gerrit.libreoffice.org/21739
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 8fb5502b25f0ca0e97e3eb07b68d89d21ee3d0ec)
Reviewed-on: https://gerrit.libreoffice.org/21851
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
it returns the start of the underlying uno_Sequence
commit 78c83032b266fbb6fc20ddca86df80affaff7c24
Author: Caolán McNamara <caolanm@redhat.com>
Date: Wed Sep 30 09:40:16 2015 +0100
maSvgDataArray only populates a uno::Sequence, so use that instead
Change-Id: I335d5ee70e95e1a3b204d34f6df4cb62f3fb3cad
(cherry picked from commit ab60f6cb0f46cb71172e4248ed40e212f6ebb4da)
Change-Id: I8d2c07fec039e58d3644e4ab5eb074ee215f075e
|
|
Change-Id: I77d88d8020e9ac26bd6b7277e6d8afefed5e3ee7
(cherry picked from commit ad99c633908f7c70d06812ebfb4e0696666f0158)
|
|
signalIMDeleteSurrounding searches for the focused accessible object.
Since newly created accessible objects were not inheriting
the focus setting of their peer, the search returned nothing
until some event triggered the focus to be adjusted.
Change-Id: I92f980b4bbe741d8ce9196165eff51059c807a2b
Reviewed-on: https://gerrit.libreoffice.org/21002
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 3b14cdf7386f41395d1b089c3b9dde7d4429cf38)
Reviewed-on: https://gerrit.libreoffice.org/21562
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I0b22af14c7dd684c25cfee26e8c12b95b40479ee
Reviewed-on: https://gerrit.libreoffice.org/21406
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
|
|
This reverts commit a7816853bad55ada597092c16ba9a0a761e067d0.
tdf#94069 (freeze) has been corrected differently in libreoffice-5-1 anyway.
Change-Id: I901b16f2f1fe0cf0fd6b44c41f3dd47db88041f7
Reviewed-on: https://gerrit.libreoffice.org/21344
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
|
|
I.e., don't try to create auto-layout for clipboard pages which
don't contain one; don't resize objects to text.
Also, don't invalidate items that are equal to defaults,
because explicitly set items are not the same as absent items:
pasting an object without an item makes the property to inherit
new target's default, while when the item is present, the default
doesn't apply.
Also, don't consider selected state of the page while stringifying
- this makes selected page string to differ from not-selected
clipboard page.
Change-Id: I172e03e1a8c428e5fcae3a116cc9ad8de79f1a87
Reviewed-on: https://gerrit.libreoffice.org/20871
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 3b4059dc53ec764be5423517363223043d6dbfad)
Reviewed-on: https://gerrit.libreoffice.org/21104
|
|
Change-Id: Iecff49f04e4b68f071d63217943891a31a610aeb
|
|
This is used from oox chart import code, cf.
oox::drawingml::Shape::finalizeXShape().
Change-Id: I7b2097f8d5740a590a6473797ab9436453fbf580
(cherry picked from commit 75a200f371d12ddaf5b82af10c8d4675babcdb5e)
|
|
When the object is edited in the UI, the m_xClient is set to a
SfxInPlaceClient and the DocumentBaseURL is retrieved from it. But if
the object is not edited, it will be loaded during export via the API
and without a m_xClient; in this case the DocumentBaseURL must have been
set previously to be available during import.
There appears to be no way to get the URL of the document via the API
while it is being imported; SfxBaseModel's m_sURL is unfortunately only
initialized from SfxObjectShell::FinishedLoading().
During ODF import, the SvXMLEmbeddedObjectHelper creates the
embedded object, so let's make it pass in the parent's BaseURL.
The "DefaultParentBaseURL" parameter already exists but was unused
previously.
Change-Id: I3d1ed29b3a2c0e77ec606a1d09f7bc07e7860733
(cherry picked from commit b0fc09daf1086423a9bd457d9a2c043e7ff41451)
|
|
... to prevent duplicating masters on slide copy-paste.
Also fixed a 10-year copy-paste error (pRefPage wasn't replaced
with pNPage).
Fixed argument evaluation order issue (aStream.GetEndOfData()
depends on Flush() but doesn't call it, so will return incorrect
result if called before aStream.GetBuffer()).
Replaced compare of hashes with results of stringify(),
because it removes useless overhead (hashes are calculated from
stringify() anyway, and are not cached anywhere).
Removed Flush() called from SvMemoryStream::GetBuffer(), because
it calls GetData(), which calls Flush() itself.
Thanks to Andras Timar for unit test framework.
Change-Id: Ia46d4e9a017fc628d424949a9d229045a249a4ca
Reviewed-on: https://gerrit.libreoffice.org/20367
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 6381fe554aec600d13d0359903216811d644dd36)
Reviewed-on: https://gerrit.libreoffice.org/20694
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|