Public Git Hosting - LibreOffice.git/log

sw undo: implement SfxUndoAction::GetViewShellId() interface

With this, it's possible to tell which view shell created which undo
actions. It's visible only in the doc model xml dump only, though.

Reviewed-on: https://gerrit.libreoffice.org/27693
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit d60708c5116b4c48b30b94095aafd3e77de46f6a)

Conflicts:
sw/source/core/undo/unsort.cxx

Change-Id: Ia76d218a1d8b578aaad00ab733c772b10dda39f0

svl: add SfxUndoAction::GetViewShellId()

In preparation of a Writer version that overrides this and remembers
which view shell introduced which action.

Change-Id: I4970f8ce9c56f1b57ab1ae92f3ea8be804ca27bf
Reviewed-on: https://gerrit.libreoffice.org/27682
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 7494466e43daa4d071224f401267e2b6fd4222aa)

sfx2: introduce SfxViewShell::GetViewShellId()

This is quite similar to SwFrame::GetFrameId(), i.e. it assigns a
numeric identifier to each instance to help debugging, as those
identifiers are stable accross runs.

Reviewed-on: https://gerrit.libreoffice.org/27669
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 389d4d414291879b9097658080e405a06dc0c1fc)

Conflicts:
compilerplugins/clang/badstatics.cxx

Change-Id: I9cc57e316435f0284a1d481a956a703be859d67e

fftester: throw on empty stack access

rather than spend the rest of my life protecting each one

Change-Id: I181df33b052a0303f072ce0252d98562231569e2
(cherry picked from commit 2710211eb2333cafdb894742a8fa73fb02dc513b)

fftester: empty states stack

Change-Id: I05dfffced9a8677650a46b43f65a29e9b21c5524
(cherry picked from commit 5de2d02806669812d43e7f23db58ab7a16373ce6)

Related: tdf#75757 remove inheritance from std::deque

Change-Id: Ia50ea146052c2014ea16474186e2d15ce93581c1
(cherry picked from commit 7a887df4db129ac5222fd4068173b5a06d107a59)
Reviewed-on: https://gerrit.libreoffice.org/27640
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 3e0fad77595438e1d36b94bfd6c17d8de8f8ceb0)

fftester: empty table manager stack

Change-Id: Ia7f7ace8130d5dfe290207e0cd3d2e6a43b8ab46
(cherry picked from commit df9414084b46c1712dc7151f50023438c62301e2)
Reviewed-on: https://gerrit.libreoffice.org/27633
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 3f320c21d27c409aa086d044502acf42f60a1a36)

sd: OOoXML import: fix loss of animations

There are 2 different animation formats, legacy one used in OOoXML
format, based on presentation:animations element, and SMIL based one
used in ODF format, based on a node hierarchy with
<anim:par presentation:node-type="timing-root"> at the top.

The problem is that when the legacy animations are imported, they are
not immediately set on the draw-page in the same way as the new
animations are imported.

"soffice --convert-to odp ooo28334-1.sxi" loses all of the animations,
whereas loading the file in the UI and storing it all animations are
converted, and if you use API load/store methods some are converted and
some not depending on timing.

The problem is that there is a necessary conversion step
MainSequence::implRebuild() that needs to happen after all the
EffectMigration calls for a particular SdPage are finished, which
is only triggered by a timer MainSequence::onTimerHdl().

Fix it by forcing a call to implRebuild() from DrawDocShell::Load().

Note: SdDrawDocument::NewOrLoadCompleted() is a horribly misleading
function name as it is actually called *before* loading the document.

(cherry picked from commit 5206929f3a125a739adb860709586a0f50cb9611)
Reviewed-on: https://gerrit.libreoffice.org/27509
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 4ca12100ef036c6005d799e26801970118f591f4)

Change-Id: I9881cb9bf2ae6ccc5fcf06602343f2d0e0704699
Reviewed-on: https://gerrit.libreoffice.org/27538
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e36acbf3aae7c92c2724b9f3c801735f2321cf05)

Related: tdf#100813 crash in this doc on scrolling past page 44

Change-Id: Ib9f1f6f43229ce29e7db7e3fcdacaa10fb692ca4
(cherry picked from commit e1b90609d50b9b8bb48e7c6548b197ed7de77253)
Reviewed-on: https://gerrit.libreoffice.org/27361
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit be1cd0aded725d307ee9b53529c1122655b2a391)

update credits

Change-Id: I9679f7b0693ecc380d756b18025b09225afd414c
(cherry picked from commit ce3577056dd44d35b38894b7ec573951208209eb)
(cherry picked from commit b80a85b160126c758e210b7243047b83705b1efd)

tdf#101138 opengl: blacklist intel drivers for Win 7

Change-Id: I1b3db15b2fbdd948dcc9bacf7891f8429f066150
Reviewed-on: https://gerrit.libreoffice.org/27547
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 97fb2a8a43f11dba7c3e82380589b2334d09865a)

No need for own implementation of erfc() in OpenCL

The own code was copied from the C++ one we used to have in
sal/rtl/math.cxx but which was removed in
a62bc6a65abb47adb0e4caff7e38823c15b302fc. However, it did not work
correctly on some machines at least, like my AMD A10-7800 running
Windows 10. I was unable to figure out why not. This lead to OpenCL
being disabled by the Desktop::CheckOpenCLCompute() code we now run
early on startup.

Anyway, as OpenCL has erfc(), just use that.

(cherry picked from commit 4afa88f289de1150850b52d36f2345fd9a9fbc1e)

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

Need to try to avoid TDR also with NVIDIA cards on Windows 7 or earlier

(TDR is Timeout detection and recovery, was introduced in Vista.)

Change-Id: If88f8e9e2aff2a5ffd633607ee6aebb5614c5caf
Reviewed-on: https://gerrit.libreoffice.org/27522
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 cb7b91e9946fdf628b750bcfd318545f8a033b34)

Resolves: tdf#101096 remove the "H after M" rule

wrongly introduced with c9ed6e832213129cc579c1c309ce9dbd3593c57a

Change-Id: Ic6c9c404ad0af11eb5d638f453150ee0da60e633
(cherry picked from commit c6e7dbaaa471861dcf76186ed3978ac95f81256e)
Reviewed-on: https://gerrit.libreoffice.org/27528
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 57137b00aebbf93b458c04a67f38f62139ee0e20)

crashtesting: fix tdf92993-1.docx failure

Change-Id: I76f09a09fd6c3b114ba74737d4a1ba5dad0fd28f
(cherry picked from commit 5e46e382694587e88ecdebc7fa57e90fbaca7a76)
Reviewed-on: https://gerrit.libreoffice.org/27436
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e213a7cfe79f594065b6d64114749c5f49f2380c)

tdf#101070: svg/insert, avoid infinite recursive loop when referencing oneself

See bt https://bugs.documentfoundation.org/attachment.cgi?id=126377

Change-Id: I3c6546a5449fc42613e30a7f45f31862752b7187
Reviewed-on: https://gerrit.libreoffice.org/27468
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 b7a18f18efbba086454e3b5ec157b156980f97b6)
Reviewed-on: https://gerrit.libreoffice.org/27479
(cherry picked from commit 373e73418addd13bdf55716ccb424feaa42708fc)

s/LibreOffice/Collabora Office/ for the product name in one more place

Otherwise I get: ERROR: Product Collabora Office not defined in
/Users/tml/lo/co-5.1/instsetoo_native/util/openoffice.lst at
/Users/tml/lo/co-5.1/solenv/bin/modules/installer/ziplist.pm line 150.

Change-Id: Ibd38e8f081c883ceb393896c0ac35c9be0260847

Quote the product name as it might contain spaces

Otherwise we get "ERROR: unknown parameter: Office" for a product
called Collabora Office, for instance.

Change-Id: Iec99a3eb0848c34861be03ab6036aed707b20ac4

sw layout xml dump: mention SfxViewShell addresses

Change-Id: I2e5c8102684494fd3d7c1c70971a09d0c940a124
Reviewed-on: https://gerrit.libreoffice.org/27637
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 73c8bc849c0024d5d81ab0370cffa6aa24b56d22)

tdf#101168 sw: fix missing repaint on undo with multiple windows

Need to lock / unlock all view shells, not just the current one.

Change-Id: I754214a202c6bbb74daac6f933481cb3fe7b9dbb
Reviewed-on: https://gerrit.libreoffice.org/27620
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 1e21c32a2f81b4ae5302fc8d537e4f200a1a3e76)

sw: rename generic rSh in SwBaseShell::ExecUndo()

So that it's a bit more obvious it's not a base shell nor a view shell.

Change-Id: I723a6394c59f4013576e3c4e2ff3016369d2227c
Reviewed-on: https://gerrit.libreoffice.org/27616
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 9e903fc1d477e2f65653b36364de0c46a5151955)

gtktiledviewer: quit after the last view is destroyed

To allow debugging crash-on-exit problems.

Change-Id: Ie54a8391e721c3ba8034b4618dd30733bac97a27
Reviewed-on: https://gerrit.libreoffice.org/27605
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 538ea31c992acb9d47ffd783543e50e149272aac)

fix typo

Change-Id: Iad24dfe97c9d360879d471606a9df340268860b2
(cherry picked from commit 4186368f9240acf0b5951d541d5ed1a4790e711f)

svx: fix loplugin:nullptr

Change-Id: Iff5fbb5c8b2885b0ba84c08f1357fdfc82ecf016
(cherry picked from commit 66dd26659e7c4bb731a88e7dbc809c5b53cb79c3)

svx lok: fix handling of text edit drawing when view/page changes

This is a follow-up to commit 9d91d371e92548c7f75a7d0155eecaf3769fdee6
(svx lok: draw text edits in all views, 2016-07-26). Two corner-cases
are now handled:

1) When the SfxViewShell is created after begin text edit and
2) When the other draw view is already created, but at the time begin
text edit happens, the other draw view shows a different page.

And the opposite of these: switching away from a page were we observe a
text edit done in an other view or destroying a view that observes a
text edit.

When the complete view goes away, then SdrObjEditView::HideSdrPage() is
not called, so also try to destroy the outliner view of the text edit
from SdrObjEditView::DeleteWindowFromPaintView(). The GetSfxViewShell()
call in SdrObjEditView::ShowSdrPage() is important, because we let the
other draw view create the outliner view, but the outliner view should
invoke our view shell, not the view shell of the other draw view.

Also improve the SdTiledRenderingTest::testCursorViews() testcase, so
that it asserts it managed to begin text edit and use a test document
that still has a single slide and shape, but the shape is not
auto-sized; otherwise invalidations happen even if outliner views are
not created in all draw views, so the test would pass even without the
fixes.

Change-Id: I2c3bb27826c6887115366db818599fc8adabc5a5
Reviewed-on: https://gerrit.libreoffice.org/27583
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 5f65ca15a2297f298536d07cfa8564a1f7c67abb)

svx lok: avoid SfxViewShell::Current() during constructing a new view shell

Currently when a text edit is started, then in the LOK case if there is
an other view that shows the same page, then both draw views will have
an outliner view showing the text edit. This means that in case a view
shell is created after starting the text edit, that won't have an
outliner view for the text edit.

Before fixing this, calls to SfxViewShell::Current() has to be avoided
when we're in the process of setting up a new LOK view. In case of
Impress, this is a double initialization, and by the time
SdrObjEditView::ImpMakeOutlinerView() is called, we're already in the
process of setting up the second SfxViewShell (as part of
SdXImpressDocument::initializeForTiledRendering()), but
SfxViewShell::Current() still points to the old view shell. Which means
that the outliner view would refer to a view shell that's deleted soon,
and we crash as soon as it tries to invoke a LOK callback.

Fix this by adding a virtual member function to SdrObjEditView, and
override it in sd, so in case applications want to provide a more
precise way of giving the view shell owning a draw view, then they can.

Change-Id: Ie0005f73237d4ff9cf576bf16fa5b46280f13759
Reviewed-on: https://gerrit.libreoffice.org/27561
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit c0f1c0da77cf9f148b3f29aaf0965dfb43b8a32c)

svx lok: draw text edits in all views

Use case: a document has a shape with text, and two views. If one view
starts to edit the shape text, the model text is hidden (via
TextHierarchyEditPrimitive2D), and the in-progress text was painted
directly only in the view that edits it. The remaining views presented
the shape as if it had no text. This commit addresses the subset of this
use case when the views are already created and they already show the
same draw page.

Fix the problem by looking for other views showing the same draw page,
create a view of the text edit for them, and paint them in all views
after the own text edit is painted.

There is not much LOK-specific in this code, except that some extra code
would be needed to not paint the blinking cursor of the text edit in
other views, and then it could be enabled in the non-LOK case as well.

Change-Id: Ib3096a3369fa56663ee209794e102090d362de66
Reviewed-on: https://gerrit.libreoffice.org/27535
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 9d91d371e92548c7f75a7d0155eecaf3769fdee6)

sc: implement LOK_CALLBACK_VIEW_LOCK

This is the same shape text editing indicator that's available in Writer
and Impress already.

Change-Id: I5f7fbf2efdc92a10b169a3f1b27e24426f3dfb3d
Reviewed-on: https://gerrit.libreoffice.org/27507
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit d54fdb0b1b9c8115c7766061d7d698d84c21c887)

lokdocview: draw a lock inside the lock indicator

Hopefully less confusing, the crossed out rectangle is also used inside
the tiles for deleted comments, and the two are independent.

Change-Id: Id06fbf6ec1b21dfbab1c126c3c432f91cf51430c
Reviewed-on: https://gerrit.libreoffice.org/27503
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 57c8915376dbb580760486071cac6533e05427bf)

sd: implement LOK_CALLBACK_VIEW_LOCK

So that edited shape text doesn't just disappear in other views without
any indication.

Change-Id: I806051492f7bc247c0e66eceda4df5eba8322aad
Reviewed-on: https://gerrit.libreoffice.org/27444
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit ffd9972e2a21f6490f25c712cd0ba49e534238c8)

sw: add new LOK_CALLBACK_VIEW_LOCK callback

When we're after SdrBeginTextEdit(), but before SdrEndTextEdit(), and
have multiple views, then only the active view paints the edited text,
the other views look like the shape has no text at all.

Add a new callback that exposes the position and size of the rectangle
where the shape text will be painted after text edit ended, so clients
can draw some kind of locking indicator there. This way the rendered
result can differ in the "shape has no text" and the "shape text is
edited in an other view" cases.

Reviewed-on: https://gerrit.libreoffice.org/27441
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 897189cfc6b3f6f3a9a0148b060ea25e5f8d9eaa)

Conflicts:
libreofficekit/source/gtk/lokdocview.cxx

Change-Id: I6096479a8a05c2547d15222e6d997b848af02945

Resolves: tdf#100845 exception during vcl painting -> std::terminate

GetText throws under the circumstances described in the bug where
the record is missing

Change-Id: I03b0ce9a19d93a7eb8842831b433b80a20628541
(cherry picked from commit d8e225304b7c8465f5e7f038ec02270445e1b600)
Reviewed-on: https://gerrit.libreoffice.org/27341
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 90a26f7501b3829eba28e61f5dbae6ce6927b1f1)

Resolves: tdf#101011 atk needs a value for accessible-table-column-header

This presumably became a problem after...

commit 76c549eb01dcb7b5bf28a271ce00e386f3d388ba
Author: Steve Yin <steve_y@apache.org>
Date: Fri Nov 29 13:03:27 2013 +0000

Integrate branch of IAccessible2

added a TABLE_COLUMN_HEADER_CHANGED usage which triggered it.

Change-Id: If54b7a39a170566cf7def3548ba385fa5d99bb1c
(cherry picked from commit 9b47a8b21f87fa77d2d61ac4a2c2bbc7c0d67a19)
Reviewed-on: https://gerrit.libreoffice.org/27369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit a768e5b7ff3a4788bbe6d23e427e34e9e81442c1)

Resolves: tdf#101054 crash on options->path with non-native file picker

regression from...

commit 3bbc0574d78d129359638b74612de2f93419eeb0
Author: Caolán McNamara <caolanm@redhat.com>
Date: Tue Jul 5 10:16:51 2016 +0100

Resolves: rhbz#1352835 path options doesn't promptly destroy folder picker

only clear the xFolderPicker immediately in the non-async case

Change-Id: Id6a411424d41262a9379ad3eb7976c8dd666a5cf
(cherry picked from commit c1bd3156cf66318023f36d81ce809a38072588e4)
Reviewed-on: https://gerrit.libreoffice.org/27418
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 354c148edce5cafa1efb136630618f3063ce3c99)

Resolves: tdf#100558 last 'section' of date field not incremented

presumably a regression from...

commit 3cad6c806e5247ce20b78eb688551aa5d872b934
Author: Chr. Rossmanith <ChrRossmanith@gmx.de>
Date: Fri Mar 1 21:47:10 2013 +0100

Replace (Xub)String with OUString in vcl(field)

where UniString::Search returned a max short on not-found
while OUString::indexOf returns a -1

Change-Id: Ia3ef80dd318375ccdb3bdcee9bed7b70bf67cae1
(cherry picked from commit 82913e694a4169f9ddeef399e659aec78cc9c8d6)
Reviewed-on: https://gerrit.libreoffice.org/27375
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 836a7634b2042de4f08fcc2296fc33ca2d040a60)

Resolves: tdf#100847 also external svEmptyCell is 0 in numeric context

Regression of 243f19a1878d52a4074b59041dc3bc57ab84e417 that now
differentiates between numeric and string content of external
references' cells.

Change-Id: I7a9635357cc7651353067a38f9ac8bc295f88546
(cherry picked from commit 89a5464a21046821648ec77f03db8316ceb4e6f8)
Reviewed-on: https://gerrit.libreoffice.org/27111
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9c30e2aab23e34ba91dbe80b7dd5e5c352bbaeb0)
Reviewed-on: https://gerrit.libreoffice.org/27372
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 38aceeda9df7a04bff344c82c4bc077217b1178d)

Resolves: tdf#98778 fix parsing of exponents

regression from...

commit 9e9f39d171cafa035d7b8e74187e25c3581cb89d
Date: Tue Mar 19 23:23:16 2013 +0100

resolved rhbz#919020 Basic CDbl() and CSng() scan localized number

Change-Id: I96535fd9bc9ec59d6e07739a3118c96eb2d8bd05
Reviewed-on: https://gerrit.libreoffice.org/27342
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 2aed0d49d7891b9360916b65771222810aeeac96)
Reviewed-on: https://gerrit.libreoffice.org/27350
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 43d1f9bfd4300e8bf5bcb631dcc2d849b4490d3a)

gtktiledviewer: align to top/left for Calc

Otherwise when zooming out enough that not all available space is used,
the default horizontal/vertical centering happens, and the row/column
headers and the tiles become out of sync.

Also revert to the previous default window size, I'm not sure why that
was necessary. Currently checking the mentioned situation (empty Writer
document with comments only) does not require this larger size, and
testing two views is easier with the smaller size.

Change-Id: Ia92a591387f62655a671e2d09f5053827fde5045
Reviewed-on: https://gerrit.libreoffice.org/27427
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 672b7411637f92acd30622ec2aaee840cbbbd0a9)

sc: provide size in the payload of LOK_CALLBACK_DOCUMENT_SIZE_CHANGED

The sw implementation does so, and the API documentation also says
clients can depend on this.

Change-Id: Ib4d25d7207fd8358de2ec1186d4ca2306e996497
Reviewed-on: https://gerrit.libreoffice.org/27379
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 27aac319ca9f2d580aea45542c5d0428616f7e0b)

sd lok: fix hard to select a full table

It requires a precise mouse down button in the rectangle border bounds
to select a full table, so it has added a tolerance value.

Reviewed-on: https://gerrit.libreoffice.org/27356
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Conflicts:
include/svx/svdotable.hxx
svx/source/svdraw/svdview.cxx
svx/source/table/svdotable.cxx

Change-Id: Ia8213ae452f93cd2faa957a50246638d1eb2198e

CppunitTest_sd_tiledrendering: fix undefined behavior, leading to crash

Execute() version that takes an std::initializer_list<> is named
ExecuteList(). But that's not available in this branch, so make sure
that the last argument is a nullptr.

Change-Id: Iaa42ac417abec334b1c053fb7d357dce529c6956

sd lok: decouple vcl window focus from cursor visibility

The problem was the the blinking cursor was hidden when another vcl
window got its focus, so it wasn't possible to edit two shape text in
parallel in two windows.

The code path is like this:

- show cursor, cursor is created: SdrObjEditView::SdrBeginTextEdit() ->
  OutlinerView::ShowCursor()
- show cursor, focus case: sd::FuText::Activate() ->
  OutlinerView::ShowCursor()
- hide cursor, cursor is deleted: SdrObjEditView::SdrEndTextEdit() ->
  OutlinerView::HideCursor()
- hide cursor, focus case: sd::FuText::Deactivate() ->
  OutlinerView::HideCursor()

So add a new optional bool parameter that allows not emitting the
LOK_CALLBACK_CURSOR_VISIBLE callback in the focus change case.

Also, if we're at it, make sure that painting emits no show/cursor LOK
callbacks.

Change-Id: I1068a1b1f5cd76fd09b5a79066834bfb0daebc77
Reviewed-on: https://gerrit.libreoffice.org/27335
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 6ea8084487411feea049f57712979fba4ad2fbce)

lokdocview: still allow view selections/cursors from other Writer views

Writer pages are exposed as parts, but it still makes sense showing
selections/cursors from other parts in that case.

Change-Id: Ic76d93291bde2d959c149cf2ef5eba7ed33a45e8
Reviewed-on: https://gerrit.libreoffice.org/27321
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 3c425926d48e513937ad727a56ab7744ca379e63)

sc lok: notify other views about selection changes of multiple cells

A single cell is handled by the cell cursor, which was already handled.
This one takes care of the situation when multiple cells are selected.

Change-Id: I11b3045e4884ad9629655e2c05c16af83d21e7b2
Reviewed-on: https://gerrit.libreoffice.org/27318
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 495cfa27c173741caa233575438c18746272b4aa)

lokdocview: handle part number in view selections/cursors

This way we show view selections/cursors from other views only in case
the part number matches. Anything else looks buggy in Calc/Impress.

Change-Id: If3ecbfc4b05350606730319b1a570afc15fd9d0a
Reviewed-on: https://gerrit.libreoffice.org/27315
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 1ba00c2173938ed2ea2f25074e866ea51370d727)

sfx2 lok: expose part number in SfxLokHelper::notifyOtherViews()

This way a client can decide if the view cursor it gets is relevant (the
views show the same part) or not.

Change-Id: I7b274b28f0c4f0509df5071831acf50512eff640
Reviewed-on: https://gerrit.libreoffice.org/27311
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 299b9377469473abd8f58ba7f1054794491bdc56)

CppunitTest_sw_tiledrendering: blind stack-use-after-return fix

Change-Id: I23c0324979939955f94408a452020e9776358967
(cherry picked from commit 58b592a59122144d6c5446f200dd2f48108c8909)

lok::Document::destroyView: clean up view cursors/selections

(cherry picked from commit bc9b4fd4c83af3532204237157821d4884c42d8e)

Conflicts:
sd/source/ui/view/ViewShellBase.cxx
sw/source/uibase/uiview/view.cxx

Change-Id: Icd3f96a922e7d1aec0d52e90df87ec45790c9807

sfx2 lok: handle when SfxViewFrame::Current() returns nullptr

In these two cases no need to call it and dereference the result
unconditionally, there are other ways to get the info.

Change-Id: Idb5969e909dc2faed97a5a4ac79dfcc1aec8ddcd
(cherry picked from commit 85c5a172953ac29d1fcab3f4c2f19fa897074e52)

lokdocview: ignore notifications on view shutdown

Callbacks are processed on idle on the main thread, so by the time we
parse them, possibly the widget is already gone, avoid that problem.

Change-Id: Ie8e16423d1ffe087e0dd21425026f7a5d644c27b
(cherry picked from commit 8090b53e0e16e9aef95f2f5557985f7c2e7c69f3)

gtktiledviewer: allow testing of destroyView()

By calling it when we're not the last window.

Change-Id: I6fd4763243fc088ccfe015b6c03b6b3f25146fac
(cherry picked from commit 99f05d9947db2dd0676fafa66106d17e4d8eea6d)

sw lok: fix shape text editing with multiple views

When changing the active view shell,
sw::DocumentLayoutManager::GetCurrentViewShell() is not instantly
updated, only when e.g. the focus changes. This means that calling
setView() + paintTile() pairs on random views typically did not use the
matching view shell, but the last one. This has a visible effect when
editing shape text, as the non-text-edit views had the outdated shape
text visible, unlike on the desktop.

Fix the problem by using SwDocShell::GetWrtShell() instead.

Change-Id: Ia4b67d0a8931692ed4fc5c5e97cc1a09ef81e647
(cherry picked from commit 5a3653f87502e40cf00d8f1ed1c0ecf5a979e67d)

vcl headless: ignore visibility in GetClientSize()

This fixes the missing-invalidation problem outlined in commit
22023b104cd1e024aecc28a6161bea519a584407 (vcl lok: fix missing paints
due to zero-sized windows, 2016-07-12) also in Writer, not only in
Impress. Starting text edit, doing a change, and ending text edit now
results in the expected invalidations.

Ignoring visibility seems to be a better fix for the missing paints.
This way the headless case doesn't hit the corner cases of 0x0-sized
windows. Also, the gtk vclplug's GetClientSize() only returns 0x0 in
case the underlying window is disposed or it's minimized, but it does
hand out the size before Show() is called, so now the headless backend
is in sync with that.

Change-Id: I78698cbfce954c8c593d279ab057a87cfbe87260
Reviewed-on: https://gerrit.libreoffice.org/27224
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit ac0b3b05ab52d0ac06137cf93d71187c7957ec99)

vcl lok: fix missing paints due to zero-sized windows

How to reproduce the problem: open an Impress presentation in
gtktiledviewer, create two views. Start editing the text of a shape in
one view -> nothing happens in the other view.

There is no invalidation in the other view, as
sdr::contact::ViewContact::AddViewObjectContact() is not called for
either of the views. Editing with a single view only worked as when
clicking into the shape, the ViewObjectContact is created.

On the desktop, those ViewObjectContacts are created on the first paint
of the slide, but in the LOK case the vcl::Window instances had a 0x0
size, so an invalidation didn't result in a paint -> no
ViewObjectContact was created -> no LOK invalidation was sent.

No testcase, as I didn't manage to write code that actually triggers the
failure under cppunit with the fix reverted.

Change-Id: If29fcea4258a45f3d6d9aab284445756609fa13c
Reviewed-on: https://gerrit.libreoffice.org/27159
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 22023b104cd1e024aecc28a6161bea519a584407)

lokdocview: log the view id of the callback messages

So that e.g. it's possible to see which invalidation affects which view.

Change-Id: I6b6db2fa07eaecd1315ce8160c3b3b86e9e5a348
Reviewed-on: https://gerrit.libreoffice.org/27138
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 29089b562ea6d0137cf054d9710b7238e327aa4f)

tdf#100600 sfx2 classification: never replace the control with label

Thanks to Caolán McNamara for pointing out where is the condition of the
replacement in VCL.

Change-Id: I7e1ef4a016a37b25e084c4c6467a42ca557069a4
Reviewed-on: https://gerrit.libreoffice.org/27133
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 8192da8e4de7a058ef95253f992f4143f83fa0f1)

sw lok: add LOK_CALLBACK_VIEW_CURSOR_VISIBLE

With this, in case a text cursor is turned into a graphic selection in
view#0, then view#1 can also hide the text cursor of view#0.

Change-Id: I7de89b8537ef8b0985336793b719d93733604bff
Reviewed-on: https://gerrit.libreoffice.org/27044
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit af8419fa1d3cea57481e0e53518237eea2d9cdad)

svx lok: add LOK_CALLBACK_GRAPHIC_VIEW_SELECTION

So a view can be aware where the graphic selections of other views are.

Change-Id: I0cc420cfe4bf3824fbfa1a58da889cac5e9a7b60
Reviewed-on: https://gerrit.libreoffice.org/26863
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 3ebfc5b95559a9bcb2fc0508b51fd00e8eb20260)

lokdocview: replace handle_graphic.png with manual drawing

If we draw a black graphic handle manually, then it's possible to color
it later, this isn't easy if a bitmap is painted.

Reviewed-on: https://gerrit.libreoffice.org/26860
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit cca44fe22978c6c1c5f3ec500e5ac07becf53745)

Conflicts:
scp2/source/ooo/module_libreofficekit.scp

Change-Id: Ib4456fd5155862d52e3ffa79ee49c7bfd16fb742

CppunitTest_sc_tiledrendering: clear reference to local var in time

Should fix
<http://ci.libreoffice.org/job/lo_callgrind_linux/2013/console>.

Change-Id: I4ff4ddafbbb15ee360cb845afe8e8b4dbbf04460
(cherry picked from commit d77d81604d8604652772e0819e5cf5e472865c65)

sc: add LOK_CALLBACK_CELL_VIEW_CURSOR testcase

Fails with the sc/source part of commit (sc lok: add
LOK_CALLBACK_CELL_VIEW_CURSOR, 2016-07-01) reverted.

Reviewed-on: https://gerrit.libreoffice.org/26856
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit e3c36c789f481b855c0fb556a09f4b81401ed3db)

Conflicts:
sc/qa/unit/tiledrendering/tiledrendering.cxx

Change-Id: I4a1a7d97b744dd089fe15bd58af6cca5e0b79e8f

CppunitTest_sc_tiledrendering: replace ifdefs with a single makefile condition

Reviewed-on: https://gerrit.libreoffice.org/26849
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 8e3451c096987e6fc7eaca409fd45a62e13ae4c5)

Conflicts:
sc/qa/unit/tiledrendering/tiledrendering.cxx

Change-Id: I1dded11e0572dee7cd917a1aa8c2e2ca53b81d84

sc lok: add LOK_CALLBACK_CELL_VIEW_CURSOR

So a view can be aware where the cell cursors of other views are.

Change-Id: Ifcf06c0019c6af8b859e2e92222e4f3fd18da74f
Reviewed-on: https://gerrit.libreoffice.org/26844
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 68c5c0bb7eed007bbfbb2e51107fc0196825e85a)

sw lok: mix missing invalidation due to page calc in visible cursor change

Steps to reproduce in gtktiledviewer:

- two windows, then enable edit in both
- view #0: go inside a word
- view #1: select the same word
- press Del in view #1 -> no invalidation

Fix the problem by changing the LOK-specific GetPageNum() call in
SwVisibleCursor::SetPosAndShow(), so that it doesn't re-calculate the
frame, that way later when SwLayAction::TurboAction_() attempts to
re-calculate the layout, then the frame will be still invalid, and that
re-calculation then triggers the necessary invalidations.

Change-Id: I8c4472b9809537fcbd4a20c73f39be7ebca16b1f
Reviewed-on: https://gerrit.libreoffice.org/26802
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 6168f10b6280b2d60de44a333f3f1dc23cbb9bcf)

lokdocview: avoid pointless setView() before getView()

This fixes the following use-case:

1) Start gtktiledviewer, click New View
2) Click Edit in the first view
3) Click somewhere in the document in the first view -> nothing happens

Change-Id: I79d63538607f03b78851a639adf158d918745276
Reviewed-on: https://gerrit.libreoffice.org/26789
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit bfd4234fd863ee75f4f07d9bded061063bbde3d4)

LOK: change back type of view ids to int

Commit 45c2410041c48c22bd860efb42d4daadad7869b0 (LOK: change type of
view ids to uintptr_t, 2016-06-17) fixed the problem of view IDs being
reused for the price of random IDs, which makes debugging harder.

Implement a simple shellToView() function that makes sure view IDs are
not reused, and stop exposing view shell pointer addresses, which allows
reverting the LOK API change.

Change-Id: I63089e6de08ee7e1c7706757d43a11f6cf4d6e06
Reviewed-on: https://gerrit.libreoffice.org/26773
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 615c37503cffa92a663245d7cb140f316ace0506)

framework: fix typo in dispatchdisabler

maDisabledURLs is a set, aDisabledURLs is a sequence, the intention is
to copy the set into the sequence, not to copy the (empty) set into
itself.

Change-Id: Ib262e863b1f1aa4c455bd7552df3dc2c3f73a400
Reviewed-on: https://gerrit.libreoffice.org/26765
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit f4f580f4a4683ab09c94cfd2dfa9d203881e3eb5)

Remove unused SfxObjectShell::libreOfficeKitCallback()

All clients have been converted to use
SfxViewShell::libreOfficeKitViewCallback() instead.

Change-Id: I793dad5194769f331037b12a1b1afba96ddea4ba
Reviewed-on: https://gerrit.libreoffice.org/26584
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit ed2d342e97e43ff25f450ab6a5752baded6813e4)

Remove no longer needed ImpEditView::mpLibreOfficeKitSearchable

All clients has been ported to use
ImpEditView::mpLibreOfficeKitViewCallable instead.

Change-Id: I3a2513ac5900f801a2e7aec79807f4e333dfba3d
Reviewed-on: https://gerrit.libreoffice.org/26561
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 03e83de83bcc640cf359fe7997edcdadb5067b36)

lokdocview: ensure setView() + doSomethingElse is atomic

Otherwise it's possible that a keystroke is sent in for a different view,
when that other view reacts to an invalidation (invoking paintTile())
caused by a previous keystroke.

I.e. open two views, place the cursor at different positions, type fast,
and some of the characters appeared at the incorrect view.

Change-Id: Ie5e471f1b9c2d69adaa87111fba74d4abe184ef8
Reviewed-on: https://gerrit.libreoffice.org/26562
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 380a646b957052f96b3f9440d20dc63fc72e1d46)

sw: add LOK_CALLBACK_TEXT_VIEW_SELECTION testcase

Fails with 9f66db9c474f71f43d7a3667230241fd4fa4183f (sw lok: add
LOK_CALLBACK_TEXT_VIEW_SELECTION, 2016-06-21) reverted.

Change-Id: Ide21167ce2dc4287b1860b5f03a6975dc9edd4c6
Reviewed-on: https://gerrit.libreoffice.org/26550
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 45182f36ef263d6fd94cc79bb242fbfb5a471c22)

lokdocview: handle LOK_CALLBACK_TEXT_VIEW_SELECTION

It's similar to the normal selection, but it's colored and has no
handles.

Change-Id: Ibd9594b4834ff4f9b1cfd85912ed5cee3c8b8c71
Reviewed-on: https://gerrit.libreoffice.org/26543
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 6b9053d371fc8b8543faf7add5fb6d61aab26605)

sw lok: add LOK_CALLBACK_TEXT_VIEW_SELECTION

So a view can be aware where selections of other views are.

Change-Id: I5026b1ff2b99a4eedfd0bde32a05ceb8e2f424bc
Reviewed-on: https://gerrit.libreoffice.org/26542
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 9f66db9c474f71f43d7a3667230241fd4fa4183f)

Remove no longer needed vcl::ITiledRenderable::registerCallback()

All clients has been changed to use
SfxViewShell::registerLibreOfficeKitViewCallback() instead.

Reviewed-on: https://gerrit.libreoffice.org/26540
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit e65b5c19985d725779d8381cc3bd75c441c0ff2e)

Conflicts:
include/vcl/ITiledRenderable.hxx

Change-Id: I2538268dc9c4b449f68b5d2b05a72de584c29fd0

sfx2 lok: fix missing view cursors in a new view

When a new view was created, the old views got the position of the new
view, but not the other way around.

Make sure that the old views notify the new one right after registering
the callback.

Reviewed-on: https://gerrit.libreoffice.org/26523
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 4d211384f048b689f20e46d4d586f342b110cb5c)

Conflicts:
sfx2/source/view/viewsh.cxx

Change-Id: If26edbd57aa939e453d95f4907a0e5722329dd65

lokdocview: handle LOK_CALLBACK_INVALIDATE_VIEW_CURSOR

It's similar to the normal cursor, but it's colored and does not blink.

Change-Id: I6a869a98f46979946f320905426e016fe011cbc6
Reviewed-on: https://gerrit.libreoffice.org/26522
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit ada901d2c412f8a1b1ae668e883114ccb9c69277)

sfx2: implement per-view LOK_CALLBACK_CONTEXT_MENU

Reviewed-on: https://gerrit.libreoffice.org/26293
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commits b8a1d072ff8e686fad4a507b85d163d699ed59e0 and
5b5706f41f97998785e1e7ad356580772da80c42)

This fixes the failing CppunitTest_desktop_lib in this branch.

Conflicts:
sfx2/source/control/dispatch.cxx

Change-Id: Ia321d2f03bf77eba87b1135799b3cb0409f23ebf

Bump version to 5.1-2

Change-Id: I44c7803c5dde10e70d1a6d98c48d0abf0c0edc8f

update credits

Change-Id: Ie49cfb83d86e85b593958fc4048022f71c351267
(cherry picked from commit bd894e5a7b9a9d6a3d3e4ea668bfea050ef39bae)
(cherry picked from commit 8a22eab3b59d7188bf40f0fa3b25c2893cd06f85)

vcl: This seems a missing return

Change-Id: I99c3be904e9ee2ad8f76d09d1d8998a6898fb81e
Reviewed-on: https://gerrit.libreoffice.org/27283
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 0789b66353f75f4791754727629f553aa717be67)
(cherry picked from commit fbb6ec09e9e9c6afcce24a5fae1996d14d5866bf)
(cherry picked from commit 4fe7a96d25791d40a3a56c836ba03931e30131e4)

protect against empty m_aTableManagers stack

Change-Id: I29fecc5e0efb3b3d907f0c6505d42818fa464ffc
(cherry picked from commit 9d76d9d9abb08788f2882612cfe6d0df6e19af39)
Reviewed-on: https://gerrit.libreoffice.org/27281
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 808d72592aa6e9a9f9a8eddd4dada0fa9f14749c)

Resolves: tdf#100764 check row when determining bounds for deleted range

Regression introduced with a2e591e26549294cdb07eb685d4069343404d898 for tdf#86502

Change-Id: I493c458faedccfd6e2ddf849073a52661ef2e4d0
(cherry picked from commit ab1b351840160655a9f0caedbb35e9fdf203c5a0)
Reviewed-on: https://gerrit.libreoffice.org/27246
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 9bcc12e3b8f29067443b96cfc20cca5d183ed5cd)

forward compatibility for several _xlfn.ORG.OPENOFFICE.* functions in OOXML

as they will be written by LibreOffice 5.3

ERRORTYPE, MULTIRANGE, GOALSEEK, EASTERSUNDAY, CURRENT and STYLE.

Change-Id: Ifad317ccb2ae6dd0e53cadf2ad298490c14f1010
Reviewed-on: https://gerrit.libreoffice.org/27226
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 55a38964c28ab2fa9deac8db629c5940284b2394)

desktop: fix mismerge

Change-Id: I53a85128e7bc390aeccac4bd32e8b8adb00ae5a1

Remove no longer needed SdrModel::libreOfficeKitCallback()

All former clients are changed to call
SfxViewShell::libreOfficeKitViewCallback() instead.

Reviewed-on: https://gerrit.libreoffice.org/26521
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 3f6ad98c4764402dc6e876106867e49e3e888f8f)

Change-Id: Ic5dcf0a8a4241338fcd6941f13ce438157676481

sw lok: add LOK_CALLBACK_INVALIDATE_VIEW_CURSOR

So a view can be aware where cursors of other views are.

Reviewed-on: https://gerrit.libreoffice.org/26513
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit c544a8b674dd7ac9dd466a84a440ede030942438)

Change-Id: I6133fb55aa2869843c0284b7d76264bab3b3d5da

sw: prefix members of SwWriteTable

Change-Id: I4e8885b9fd85fdecec4f936c3c306887f1964c4b
Reviewed-on: https://gerrit.libreoffice.org/26498
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit aab2af1557d00a76258899c97bc024e85adb0ba0)

LOK: change type of view ids to uintptr_t

This fixes the following problem:

- createView() = 1
- createView() = 2
- destroyView(1)

and then view #2 was renumbered to 1.

Instead expose the pointer address of the SfxViewShell as the ID, which
is not changing in such a situation.

Note that the SfxViewShell <-> ID mapping is an implementation detail of
SfxLokHelper, and only pointers are converted to IDs, user-supplied IDs
are never converted back to pointers.

Reviewed-on: https://gerrit.libreoffice.org/26423
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 45c2410041c48c22bd860efb42d4daadad7869b0)

Change-Id: If79ef8b99ba391011b5d82b219ad13447d44cd5a

comphelper lok: remove the g_bViewCallback global

Its purpose was to allow incrementally migrate all callers of
SdrModel::libreOfficeKitCallback() to use
SfxViewShell::libreOfficeKitViewCallback() (which allows notifying only
the currently active or all views) instead. That is done by now, so it
can go.

Change-Id: I521bbbe5c638dfd844ebf025153459a37362d3c3
Reviewed-on: https://gerrit.libreoffice.org/26413
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 5b5706f41f97998785e1e7ad356580772da80c42)

CppunitTest_sal_rtl_cipher: fix loplugin:cppunitassertequals warnings

Change-Id: I94e79ae616d5cb9287e69544e283ce4d288a19ef
Reviewed-on: https://gerrit.libreoffice.org/26401
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit be4dd3954a57518168647c18af298ecda0fb2428)

comphelper: enable LibreOfficeKit::isViewCallback() by default

This requires porting the sw/sd/sc_tiledrendering test code to the new
internal API, as only the public LOK API is unchanged.

Reviewed-on: https://gerrit.libreoffice.org/26379
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 5bf3ae663a2189e37959235cda8c6a4051e10a1a)

Change-Id: Ic6a2f96421da4a16bdee7d0cbb3f6e35bc6ddff9

gtktiledviewer: Fix runtime gtk warnings

Not all buttons are toggle buttons.

Change-Id: I6cddc619f3f760e447ea3ffea07f776e03cdaab9
(cherry picked from commit 93803d86b97f9dc0e2fc003b9a19036e525a41f0)

Fix per-view CppunitTest_libreofficekit_tiledrendering

Triggered by:

LOK_VIEW_CALLBACK=1 make -sr CppunitTest_libreofficekit_tiledrendering

The problem was that on shutdown SfxViewFrame::Current() returns 0 and
then SfxLokHelper::getView() should not be called (as documented by an
assert() in it).

Change-Id: If0475ca591408d5b041c1cbde5b553d0fb8dd056
Reviewed-on: https://gerrit.libreoffice.org/26300
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 67f2aee609308ad6d43eed4f0df084e9abd50301)

sc: implement per-view resetSelection()

Fixes the following crash:

- start gtktiledviewer with a Calc document
- enter edit mode
- create a text selection (selection of multiple cells e.g.)
- leave edit mode -> assert fails

Change-Id: Ic8a65a692679afe1e293f7467f7a72cadcf9f083
Reviewed-on: https://gerrit.libreoffice.org/26266
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 3c8bbb6025a2ecccc42264d97f76928ef9ab43f7)

gtktiledviewer: fix the per-view part selector

Need to populate it & register handlers for the non-first windows as
well.

Change-Id: I27231027c3f33fb081768c51ecc291b9f2a7e99b
Reviewed-on: https://gerrit.libreoffice.org/26225
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit bf11fe9fa1e2caf752c1f9ec3ead1ef20425143f)

Give unique, comprehensible names to timers tdf#97087

Change-Id: I9f2be193b995d43d4e3440e55a025629fe5bcaed
Reviewed-on: https://gerrit.libreoffice.org/26222
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit e8dfe9bca7c2430df9d231ec79ed540e45f18789)

convert more DBG_ASSERT(false to SAL_WARN

Reviewed-on: https://gerrit.libreoffice.org/26195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 272a8afa60fe9a6b497c69a58b0054ad5b880690)

Change-Id: Ie52f28f28c67a91c4d3d4517d5c6a466890c7a55

convert DBG_ASSERT(false, to SAL_WARN(

Change-Id: I400d728c5d99228c5ca52e369037395b4da2af5c
Reviewed-on: https://gerrit.libreoffice.org/26187
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit ab10f9fc11948ca0f463aa8c0c784a574c89f8f7)

remove some unnecessary casting

Change-Id: I451df09db58256fed68ce8537b2d8eb4b6ab6942
Reviewed-on: https://gerrit.libreoffice.org/26184
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
(cherry picked from commit 2ed5fa14f0e7624db241fde26e10fdd1009adfc7)

gtktiledviewer: fix runtime warnings caused by .uno:InsertAnnotation button

It's a GtkToolButton, but not a GtkToggleToolButton, so don't cast
command buttons down unconditionally.

Change-Id: Ie7c9bdf6fa8725363e40c1544f4e1e835a559f3a
Reviewed-on: https://gerrit.libreoffice.org/26171
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 65731b68bdc67d5be1b459eea7919ec6ca26c4bc)