summaryrefslogtreecommitdiff
path: root/sfx2
AgeCommit message (Collapse)Author
2016-10-21Revert "CppunitTest_desktop_lib: add ModifiedStatus callback testcase"Miklos Vajna
This reverts commit cdf08b3aa74bb32ea18b583a9c0c41b91d7819ac. It breaks 'make -sr CppunitTest_desktop_lib CPPUNIT_TEST_NAME="DesktopLOKTest::testPaintPartTile DesktopLOKTest::testWriterCommentInsertCursor" VALGRIND=memcheck' (it is terminated by SIGSEGV), and also it's the reason why sometimes the lo_ubsan buildbot fails, see e.g. <http://ci.libreoffice.org/job/lo_ubsan/329/console>. This has to be re-introduced once I find a way to process all binding updates at once without side-effects. Conflicts: desktop/qa/desktop_lib/test_desktop_lib.cxx sfx2/source/control/bindings.cxx (cherry picked from commit b86b78e0ad9bb1e6ed2e22a0fca18cad8d19ded1) Change-Id: Id6c49b9b31095ef1a1a8c1cd92cbae5deb316500
2016-10-04comphelper: move setTiledPainting() from SfxViewShellMiklos Vajna
And make it a static one. The primary point of that member function is to prevent invalidations during paint, and since multiple views are allowed, it wasn't extended to filter out invalidations from all views, not just from the current one. (Same goes for other callback types.) (cherry picked from commit 59e38e946f19ab59370f8e52370b7a7b861cc558) Conflicts: include/sfx2/viewsh.hxx sfx2/source/view/viewsh.cxx Change-Id: I23e6b2c2ff94227f2b72c481148b2d8279ae2905
2016-10-01Resolves: tdf#100670 Crash in: sfx2::sidebar::Panel::SetExpanded(bool)Caolán McNamara
partial backport of commit e964c55f463c5b9daeb41dbed6c330b40911c313 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jan 29 18:52:34 2016 +0000 implement missing FID_FUNCTION_BOX GetState since it was turned into a sidebar thing exact how-to-reproduce of tdf#102045 is currently avoided because of... commit e1e61bf5e5f368fc1ea579f8ae5eec9faafbd599 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jun 3 11:06:22 2016 +0100 Resolves: tdf#88396 switching to sidebar panel will toggle it *off*... if its already visible. Change-Id: I17827488e49338a77ae55ba32a06415067123be8 Reviewed-on: https://gerrit.libreoffice.org/29170 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 6de338782529f65e3adb945a5e48cc6eb4f60603)
2016-09-29LOK: conditionally include part number in invalidation payloadMiklos Vajna
Since desktop/ code queues, compresses and only emits callbacks on idle, it's possible that two invalidations are in the queue, and there was a setPart() call between them. In this case it's impossible to tell what part the invalidation was sent for. Fix this by conditionally including the part number in the invalidation payload. It's off by default, a new feature flag is added to request this behavior. gtktiledviewer enables this feature flag by default, though just to show the part number in the debug output. Android doesn't enable it. (cherry picked from commit d5263c2c564c88e3dafe4c1ab8d3d9c1c48ede73) Conflicts: desktop/qa/desktop_lib/test_desktop_lib.cxx Change-Id: I73e6def848c0eb61d64e71026002c7a0e750aab4
2016-09-28sw: avoid emitting invalid cursor pos during end text edit of commentMiklos Vajna
A comment text edit (provided by editeng) works with relative twip coordinates, conversion of the cursor position to absolute twips happens in ImpEditView::ShowCursor(), provided that the pOutWin member has a map mode origin that respresents the offset correctly. This is not true during SwSidebarWin::DeactivatePostIt(), the map mode origin is already reset back to 0, so just don't emit callbacks during shutdown, the sw body text cursor will be shown later anyway. (cherry picked from commit 45fa73f87258f51bf37c92052723c4b99c49dc2d) Conflicts: include/sfx2/viewsh.hxx Change-Id: I02c15bb9fad99db8e43fd2f37df770dd165be788
2016-09-20sw: emit LOK_CALLBACK_STATE_CHANGED when cursor enters/leaves a redlineMiklos Vajna
For now only care about the start of the cursor, which can be only at a single redline. Add matching testcase + expose it in the gtktiledviewer status bar for interactive manual testing. Change-Id: Ib61757412d6b54bef64361d4a8563795ca0bab6c (cherry picked from commit 288013f25d2e52a76f7ce5368c505a6ccb3b64a2)
2016-09-16sfx2: add SfxLokHelper::getViewIdsMiklos Vajna
and also expose it in the LOK API. This way clients don't have to keep track of what views they created / destroyed, they can also get an up to date list with this method. Change-Id: Ibaee42c545803e04a31e7c13ab6ec370b99465c4 (cherry picked from commit dcc92a7cb5aa1faa711c8da7f7d8ecee0a192c25)
2016-09-16lok::Document: rename getViews() to getViewsCount()Miklos Vajna
As this only returns the number of views, not the actual views. Since it's a rename, it's just an API (but not an ABI) change. Change-Id: Ib4f0ea56a90e5ae9c80ee1781aa2f29aff4259e7 (cherry picked from commit dc00592b4e48a111efc6ff78bdbf7af998e58e22)
2016-09-14sfx2: use range-based for loop in lokhelperMiklos Vajna
Change-Id: I7c3421231dd74c8d1e2678a6aee92288fdd3221a (cherry picked from commit ecc29bf323a83b0379ffed31057c8ab409e0d2d2)
2016-09-14sw draw text: emit LOK_CALLBACK_INVALIDATE_VIEW_CURSOR from registerCallback()Miklos Vajna
With this, in case the first view has an active text edit and a new view is created, then the cursor position is instantly visible in the second view, even if the first view's cursor does not move later. (cherry picked from commit 586789fe757c0eb350c360a49cf90431a0bd5b24) Conflicts: sw/source/core/crsr/crsrsh.cxx Change-Id: Ia82e7dc1ce9bb58c67a280179ecadc74d3b63026
2016-09-09Fixed several WerrorsMarco Cecchetti
Change-Id: I97617049830dbab0ff04640a2eaecfbe39cf8305 Reviewed-on: https://gerrit.libreoffice.org/28786 Reviewed-by: Marco Cecchetti <mrcekets@gmail.com> Tested-by: Marco Cecchetti <mrcekets@gmail.com>
2016-09-01sfx2: nullptr pViewShell was seen in SfxLokHelper::getView()Miklos Vajna
I'm not sure how to trigger this reliably, but Pranav got this: #0 0x00007fb2f471bbf0 in SfxLokHelper::getView(SfxViewShell*) (pViewShell=0x0) at sfx2/source/view/lokhelper.cxx:82 #1 0x00007fb2f75edf4f in doc_paintPartTile(LibreOfficeKitDocument*, unsigned char*, int, int, int, int, int, int, int) (pThis=0x7fb290253c40, pBuffer=0x281fbd0 "", nPart=0, nCanvasWidth=1024, nCanvasHeight=256, nTilePosX=0, nTilePosY=11520, nTileWidth=15360, nTileHeight=3840) at desktop/source/lib/init.cxx:1338 Given that SfxViewShell::Current() may indeed return nullptr (e.g. during shutdown), change SfxLokHelper::getView() to return -1 in that case, and adapt client code to handle that. Change-Id: Ia191c843c8a993f3d7157de432af57964c0a8f63 Reviewed-on: https://gerrit.libreoffice.org/28583 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit f96fa389f950dd97bd213402fb5ea6eb114f9ab7)
2016-09-01sfx2 lok: introduce SfxViewShell::NotifyCursor()Miklos Vajna
It allows removing the hide/show cursor hack in SfxViewShell::registerLibreOfficeKitViewCallback() introduced in commit 4d211384f048b689f20e46d4d586f342b110cb5c (sfx2 lok: fix missing view cursors in a new view, 2016-06-20), and instead let the application code in sw/sc/sd implement the best way to show existing cursors in a new view. This way the per-app cleanup of view cursors introduced in commit bc9b4fd4c83af3532204237157821d4884c42d8e (lok::Document::destroyView: clean up view cursors/selections, 2016-07-15) has matching per-app init code. This commit just adds the API + adapts existing sw code to use it, sc/sd still has to be implemented. Based on a patch by Marco Cecchetti, thanks! Reviewed-on: https://gerrit.libreoffice.org/28557 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 7167c2b6548830b82280f2f3943d445e9afd6f5e) Conflicts: sw/inc/viscrs.hxx sw/source/core/crsr/viscrs.cxx Change-Id: I38510fa4962f405b1b96a79024206c9e7f33cad2
2016-08-19sw: remove never read SwViewShell::mbInLibreOfficeKitCallbackMiklos Vajna
This was read in the now removed SwViewShell::libreOfficeKitCallback(), so add a similar flag to SfxViewShell instead, and restore the lost condition. This fixes paint/invalidation loops when inserting the first comment to a Writer document in gtktiledviewer. Reviewed-on: https://gerrit.libreoffice.org/28236 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 8b4705e0e0c76503b1ca61cb567d222f49466fc5) Conflicts: sfx2/source/view/viewsh.cxx Change-Id: Iad5ef90848f3b309ef8db4553760dd36d9b8a37c
2016-08-19tdf#101592 sw: track changes state is doc-specific, not view-specificMiklos Vajna
So update the bindings of all views after changing it. Reviewed-on: https://gerrit.libreoffice.org/28233 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit d890ec2f130188af9d998abf5968f06e7218b7a4) Conflicts: desktop/qa/desktop_lib/test_desktop_lib.cxx Change-Id: I5355f40ba27be521dcdf343b08305f3736979bbb
2016-08-17editeng: introduce OutlinerViewShell::NotifyOtherViews()Miklos Vajna
This allows notifying other views about e.g. cursor position changes even if SfxLokHelper::notifyOtherViews() is not accessible from editeng. Change-Id: I921e97344ffe562109a221f241e70b3f68ee9aaf Reviewed-on: https://gerrit.libreoffice.org/28162 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 77235ac64be61afd707931675fec100c7c50d01c)
2016-08-15sw undo: add a Repair argument to the .uno:Undo/Redo commandsMiklos Vajna
Undo/redo is limited to undo actions created by the same view in the LOK case, this argument removes this limit. This can be used by a client for "document repair" purposes, where undo/redo of others' changes is intentional. The sfx command dispatch has support for FASTCALL slots (a state function is not called, the command is always enabled) and also has support for state functions, but those functions only get the ID of the slots, not its parameters. What is needed here is a command that's disabled by default, but in case a Repair argument is used, then it's unconditionally enabled. So handle that case in the sfx dispatcher directly for now. Change-Id: I96c1130bf51abcdd722684b1fa4a8277f92fd555 (cherry picked from commit e9bcd3475131b24b0b8818cfdfa256854ca5a59d)
2016-08-15sfx2: make SfxLokHelper::setView() set also the active frameMiklos Vajna
Without this, comphelper::dispatchCommand() doesn't work on the current frame. This causes e.g. undo not working when only a given view is allowed to do undo. In the desktop case vcl::Window::ImplGrabFocus() calls both SfxViewFrame::MakeActive_Impl() and framework::Desktop::setActiveFrame(), but in the LOK case the first was called directly, that's how the active frame was outdated. Change-Id: If97a9de316b4c8dd49e55cd273bdb2dfe9866f38 Reviewed-on: https://gerrit.libreoffice.org/28032 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit d6e8d4f773d970b69baedd8523a426f18a8d8eef)
2016-08-01sfx2: introduce SfxViewShell::GetViewShellId()Miklos Vajna
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
2016-07-29sw layout xml dump: mention SfxViewShell addressesMiklos Vajna
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)
2016-07-21sfx2 lok: expose part number in SfxLokHelper::notifyOtherViews()Miklos Vajna
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)
2016-07-21sfx2 lok: handle when SfxViewFrame::Current() returns nullptrMiklos Vajna
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)
2016-07-21tdf#100600 sfx2 classification: never replace the control with labelMiklos Vajna
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)
2016-07-21svx lok: add LOK_CALLBACK_GRAPHIC_VIEW_SELECTIONMiklos Vajna
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)
2016-07-20LOK: change back type of view ids to intMiklos Vajna
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)
2016-07-20Remove unused SfxObjectShell::libreOfficeKitCallback()Miklos Vajna
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)
2016-07-20sw lok: add LOK_CALLBACK_TEXT_VIEW_SELECTIONMiklos Vajna
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)
2016-07-20sfx2 lok: fix missing view cursors in a new viewMiklos Vajna
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
2016-07-20sfx2: implement per-view LOK_CALLBACK_CONTEXT_MENUMiklos Vajna
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
2016-07-20sw lok: add LOK_CALLBACK_INVALIDATE_VIEW_CURSORMiklos Vajna
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
2016-07-20LOK: change type of view ids to uintptr_tMiklos Vajna
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
2016-07-20comphelper lok: remove the g_bViewCallback globalMiklos Vajna
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)
2016-07-20convert more DBG_ASSERT(false to SAL_WARNNoel Grandin
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
2016-07-20convert DBG_ASSERT(false, to SAL_WARN(Noel Grandin
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)
2016-07-20Replace fallthrough comments with new SAL_FALLTHROUGH macroStephan Bergmann
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in preparation of enabling -Wimplicit-fallthrough. (This is only relevant for C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.) Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but that would require adding back in dependencies on boost_headers to many libraries where we carefully removed any remaining Boost dependencies only recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its future evolution will not have any impact on the stable URE interface.) C++17 will have a proper [[fallthroug]], eventually removing the need for a macro altogether. (cherry picked from commit 14cd5182c5f64c43581c82db8c958369152226ac) Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
2016-07-20use Any constructor instead of temporariesNoel Grandin
(cherry picked from commit 58a32075ca4f457f570af75aef368dd6c389aca7) Change-Id: Iffb82a2cee1a28d89eeea2b905aaa14086ee475a
2016-07-20Fix typosAndrea Gelmini
Reviewed-on: https://gerrit.libreoffice.org/24317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit fc2590cfa112222500a6c847917d7545f60024c6) Change-Id: Id81b16ff26283611f0b84929d831c827f847ab73
2016-07-20Avoid reserved identifiersStephan Bergmann
(cherry picked from commit 9351353b63886f494782f28f5400f5d71d22bcbd) Change-Id: I18ebddef41955948fd4528ae74f4fe9c7439d53b
2016-07-20Fix typosAndrea Gelmini
Change-Id: I4586168d3af81f047a4ded59fc6d257f17554885 Reviewed-on: https://gerrit.libreoffice.org/22194 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit 6d68e88a0fc5a54bbb826379163bd0b9c6eae0fb)
2016-07-20Fix typosAndrea Gelmini
Change-Id: Ice72f8d9971e15dd6ef365e64cd567b8581a92d3 Reviewed-on: https://gerrit.libreoffice.org/21797 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 534b2a4b58ba765dbc256d6297e33453524915e2)
2016-07-20unnecessary use of OUString constructorNoel Grandin
Change-Id: Idd31b0a53c8318af69bbcd32f6798721ec8eb8e1 Reviewed-on: https://gerrit.libreoffice.org/21945 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> (cherry picked from commit 1ef9f3988ee4dcbc77e1fdefa20442e044a67d4d)
2016-07-20Fix typosAndrea Gelmini
Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 64d624b65124ac02d8ee59b135593fd9d8eb9067) Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86
2016-07-20tdf#95505 Dump usage stats to text fileAybuke Ozdemir
1de031c94b2ef9c4ae45a8906b250a95d3c47c47 Change-Id: I1de031c94b2ef9c4ae45a8906b250a95d3c47c47 Reviewed-on: https://gerrit.libreoffice.org/20413 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit d61c16966b017abdbebf5ec0c2131de5a91c67f8)
2016-07-20sal_uLong/sal_uIntPtr/sal_uInt16 to sal_uInt32Matteo Casalin
also avoid some explicit temporaries and group some checks. Change-Id: I7795b208dde53fd383b8c75f72dd9f56429aea2b (cherry picked from commit cb98c423bbdada017a687186a5c06def6cb6f7a2)
2016-07-20loplugin:nullptr: More NULL -> nullptr automatic rewriteStephan Bergmann
Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d (cherry picked from commit fb8a3fac5d448451794804a7470be45fa14da453)
2016-07-19Fix a warning when DontTerminateEdit is mentionedPranav Kant
DontTerminateEdit was added in a5a71cea62ac3041006c5e9815ae2317999639ac Change-Id: Ia1d2ac626dbdeea689a1f36494963be18316127f Reviewed-on: https://gerrit.libreoffice.org/27161 Reviewed-by: pranavk <pranavk@collabora.com> Tested-by: pranavk <pranavk@collabora.com> (cherry picked from commit dd48972fc2b66ec2810db1a7cdf673fd5b0e9c40)
2016-07-18Resolves: tdf#100910 yes/no doesn't clear bgCaolán McNamara
Change-Id: If6a31cefe7137d338a57b5a28dfda63809957190 (cherry picked from commit 997c7accd393bc665538403a5738ce1a626d9665) Reviewed-on: https://gerrit.libreoffice.org/27260 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit bd6d7374df93cc173967a95f1deae2d667c6d963)
2016-07-14sc lok: add more toolbar itemsHenry Castro
.uno:SortAscending .uno:SortDescending Change-Id: I3d307b43fb18ffce75b00a0b919b63320bf6db05 Reviewed-on: https://gerrit.libreoffice.org/27223 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com>
2016-07-13Resolves: tdf#88396 switching to sidebar panel will toggle it *off*...Caolán McNamara
if its already visible. This solves tdf#88396, but I did this fix originally for.... on switching to slide layouts panel move into slide layout context i.e. exit current textbox edit and shape selection (cherry picked from commit 05aaef55252bc9f90cbbcc1967c38ab9a5a6c798) OpenThenSwitchToDeck actually *toggles* deck visibility so rename it to that and add a OpenThenSwitchToDeck that actually does that, using the Toggle varient as the callback from the sidebar button which toggles the current deck on/off which retains the features of // tdf#67627 Clicking a second time on a Deck icon will close the Deck // tdf#88241 Summoning an undocked sidebar a second time should close sidebar but means that calls to OpenThenSwitchToDeck from e.g. slide layout don't auto close it if that deck is already open (cherry picked from commit b81daea4a78083def286fa2d5360b152b7a703fd) 3e3724626b93447a7ab6bc7032e9c6839dabcf55 Change-Id: I16a2fca158cb4caab7b6bd001742df698735dd2b Reviewed-on: https://gerrit.libreoffice.org/27071 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit e1e61bf5e5f368fc1ea579f8ae5eec9faafbd599)
2016-07-13Resolves: tdf#100692 crash in sidebar on deleting image from writerCaolán McNamara
stumbled on this in passing and it has the same bt as http://crashreport.libreoffice.org/stats/signature/vcl::Window::setPosSizePixel(long,long,long,long,PosSizeFlags) Change-Id: I1f19275029b05f353dfa823a2ff435e5045250a6 (cherry picked from commit 675c8faefd8756f7c43312f23eb341797bcbca4d) Reviewed-on: https://gerrit.libreoffice.org/26805 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 34513f90abf15d7b5670fe3732e854d60f7358c5)