summaryrefslogtreecommitdiff
path: root/sfx2
AgeCommit message (Collapse)AuthorFilesLines
2016-08-15sfx2: make SfxLokHelper::setView() set also the active frameMiklos Vajna1-0/+10
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 Vajna3-23/+17
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 Vajna1-0/+8
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 Vajna2-0/+7
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 Vajna1-15/+2
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 Vajna1-1/+3
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 Vajna1-0/+2
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 Vajna1-8/+27
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 Vajna1-5/+0
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 Vajna1-0/+25
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 Vajna2-1/+10
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 Vajna2-121/+6
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 Vajna1-3/+9
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 Vajna1-34/+34
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 Vajna2-20/+4
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 Grandin4-9/+9
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 Grandin5-5/+6
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 Bergmann7-8/+8
...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 Grandin7-26/+11
(cherry picked from commit 58a32075ca4f457f570af75aef368dd6c389aca7) Change-Id: Iffb82a2cee1a28d89eeea2b905aaa14086ee475a
2016-07-20Fix typosAndrea Gelmini4-5/+5
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 Bergmann3-18/+18
(cherry picked from commit 9351353b63886f494782f28f5400f5d71d22bcbd) Change-Id: I18ebddef41955948fd4528ae74f4fe9c7439d53b
2016-07-20Fix typosAndrea Gelmini1-1/+1
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 Gelmini9-11/+11
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 Grandin2-2/+2
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 Gelmini20-28/+28
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 Ozdemir1-0/+2
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 Casalin1-1/+1
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 Bergmann2-5/+5
Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d (cherry picked from commit fb8a3fac5d448451794804a7470be45fa14da453)
2016-07-19Fix a warning when DontTerminateEdit is mentionedPranav Kant2-0/+4
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 McNamara1-2/+2
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 Castro1-4/+6
.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 McNamara3-5/+41
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 McNamara1-3/+3
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)
2016-07-12sfx2: clean up no longer needed SfxObjectShell::isTiledRendering()Miklos Vajna1-6/+0
Change-Id: Ia4fb0b489509364c641f8e1e695353bbdb036b59 (cherry picked from commit d0cf72f253a3cb8335601ebf2c5b1b99ab63e6b1)
2016-07-12Bin silly 'STATIC DATA' commentsTor Lillqvist5-12/+0
(cherry picked from commit 0585d81a76a99de5fb3ed2e8c34a3fc44cd83b46) Change-Id: I50e3772b7b479d2cf1eb644c7334d0f987874ccb
2016-07-12sfx2: bring the view shell's LOK callback up to date with SdrModelMiklos Vajna2-0/+27
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
2016-07-12sfx2: implement per-view LOK_CALLBACK_CONTEXT_MENUMiklos Vajna1-2/+10
Change-Id: Ia321d2f03bf77eba87b1135799b3cb0409f23ebf Reviewed-on: https://gerrit.libreoffice.org/26293 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit b8a1d072ff8e686fad4a507b85d163d699ed59e0)
2016-07-12lok context menu: Include uno commands for submenus tooPranav Kant1-0/+2
Change-Id: I4ba49ba94a3270a5d53754320e5fbd49e3f5c848 (cherry picked from commit 0a8abaadf322dca5628c6e62eb18b19394995c40)
2016-07-12lok context menu: Handle the case we only get the slot-id.Jan Holesovsky1-1/+8
Change-Id: I7a2537ccebf80c79bf61f041bfb18cd6ddc93ca2 (cherry picked from commit b98f2cc3cf8bd2721ec8118af64edd3424c69dc2)
2016-07-12lok context menu: Expose the disabled commands too.Jan Holesovsky1-32/+19
OTOH, don't show choices that don't have the .uno: command, we have no way to handle them. Change-Id: I0df6ffe2049bbf11ba4b8931164be6a3381d3916 (cherry picked from commit 788616fe7ce7c56d9dcfccafdd3e1f55036aa8a7)
2016-07-12lok context menu: Expose context menuPranav Kant1-3/+123
(cherry picked from commit 610db8d5d0500aed2ca6d4da822cf70746b44d49) Change-Id: I0968689630e10f838c075e86357eb36a9a220d0d
2016-07-12coverity#1355501 Dereference after null checkCaolán McNamara1-1/+1
(cherry picked from commit bd17307216b07599cbaa7e0111dc784e3af20ed2) Change-Id: I84001559ed2bafee16a176eb11ea991397b733bc
2016-07-12Use menu URLs for context menu interceptionMaxim Monastirsky1-1/+2
This way it's clearer what this name stands for, as it's now the same name that used to manipulate the same menus via the XUIConfigurationManager API. It's also consistent with the names we use for spelling/grammar (see SwView::ExecSpellPopup) or read-only (see SwEditWin::Command) menus. Change-Id: I0619578cea9d1f495168e2fa5060d1a664bfcd59 (cherry picked from commit 1f9374af4f8ea343db0c239d2449893ac4efc675)
2016-07-12Context menus were never destructedMaxim Monastirsky1-0/+4
Change-Id: I34ae9dbb5b00fa2b6a1ef5c115a796d4e28eafa9 (cherry picked from commit 9d6e1de029e992d189882ed7098acb6ac8cfe1fe)
2016-07-12tdf#93837 sfx2: Allow loading xml menus by resource nameMaxim Monastirsky1-29/+35
Change-Id: Ibaeeb0f891017862578440ad874f2ceb91d11874 (cherry picked from commit 399fd4153993c3677eaaf0ad01700d64a1cb5b2c)
2016-07-12nConfigId is always 0Maxim Monastirsky1-6/+3
Change-Id: Ic314bc04a22ebf23fa7b06dca06e4d2afae096f9 (cherry picked from commit 0ac22118721b426b2fc441a1c37572cda972be08)
2016-07-12tdf#93837 Adapt sfx2 to use xml based context menusMaxim Monastirsky3-1/+108
Change-Id: I71aaa98e9cf022b53cc094418bc09fb385af55ce (cherry picked from commit bb2ead8b4bcf197403842cef16a61acdb3185755)
2016-07-12loplugin:unusedfields variousNoel Grandin4-7/+2
(cherry picked from commit 1f86864e97bea96fdc608f8c8b93024ad4684d51) Change-Id: I59d9f7f73677358b4ae57efda965d43718bdf0d5
2016-07-12Remove excess newlinesChris Sherlock102-816/+0
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
2016-07-12sfx2: implement per-view LOK_CALLBACK_STATE_CHANGEDMiklos Vajna1-5/+21
With this, bindings updates ("cursor moved into a bold area", etc) are correctly sent to (and only to) the matching view. Reviewed-on: https://gerrit.libreoffice.org/26145 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit c3d837739b2ff14213b420ea613ce2fe1730a2cc) Change-Id: If10ff46dd0243cfc2f1c5566c53a7e81efa635b4