summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-20postprocess: d'oh generated files are in $(BUILDDIR)Michael Stahl
Change-Id: Id9dee9cfe065b30c2ae9bade1098d16e2c659c23 (cherry picked from commit d657a976f5ac73da5277612b4bdf6a25641e2797)
2015-08-20postprocess: try to get the right version number in About dialogMichael Stahl
Add a dependency from main.xcd to config_host.mk to rebuild it when the version number changes. Change-Id: I6878d58def57942f117b0b6e49a6c03abbeca5af Reviewed-on: https://gerrit.libreoffice.org/17539 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit da011e057e036c3f042bfdd64fed703ead9d9ec9) Reviewed-on: https://gerrit.libreoffice.org/17541
2015-08-18Stub initial pre-init phase.Michael Meeks
Change-Id: I92d172a166606189ce386826eee566623ec4a83c
2015-08-18lok: namespace and re-work various types & helper functions.Michael Meeks
Change-Id: I36e2a01822883251f9556fcde0e0a9830356ac98
2015-08-18Cleanup symbol export conditionals.Michael Meeks
Change-Id: Ic25500637f1748bf117bafd7483d589729a2e658
2015-08-17LOK: add lok_preinit symbolHenry Castro
Change-Id: I9f23a6077046809083e254d4c79590b67b071fb3
2015-08-13tdf#93154: Save button often does not saveMihai Varga
The problem is that in tiled rendering LO doesn't always consider the document to be modified. Some operations such as Bold, Italic, etc do not mark the document as being modified, but we need to be able to save the changes. This solved the issue by always allowing to save. Change-Id: Iaf8120abadc768a07b24f42c287c50080b4e4d89 Reviewed-on: https://gerrit.libreoffice.org/17665 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-08-06tdf#92982 vcl rendercontext: fix buffer size with empty user profileMiklos Vajna
I did not notice this before, as my user profile had a custom window size; but with an empty user profile the buffer had a 0,0 size, so the buffered result was empty, as no ImplHandleResize() was invoked. Change-Id: Ie299ad1323944941afc407dc90f2459d72885d42 (cherry picked from commit 968bc55adebd0158349b32a31ea341be292d8aa1) Reviewed-on: https://gerrit.libreoffice.org/17532 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-08-06don't map GDK_KEY_RELEASE to keyboard events, tdf#92996Markus Mohrhard
This was only done in the new gtk3 backend, all other backends seem to ignore the GDK_KEY_RELEASE event (especially the gtk2 one). So make the gtk3 backend code consistent with the other backends. Change-Id: I3bdecb7ce05190ee2496bc552ca79375fb6fd713 Reviewed-on: https://gerrit.libreoffice.org/17431 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a2eaa1bb9354c3e175d8b8de4f242bed89db4664) Reviewed-on: https://gerrit.libreoffice.org/17529
2015-08-06wizards: text.TextDocument.getPageCount called as class method onlyMichael Stahl
Change-Id: I9888f8ab7bccdd2902d619487279999f2ff9ab13 (cherry picked from commit c1617b8d74b5e232efeec864241ada89f874fe63) Reviewed-on: https://gerrit.libreoffice.org/17513 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-06tdf#92788 - Middle Button on Mouse Paste Option Broken for X11Noel Grandin
cherry-pick from master caused by commit 5333782d090a9e147c0c431f0f741863d1d8cf8e "convert SETTINGS_ #defines to 'enum class'" Change-Id: Id0c2738a61f73223f6c8716f04a619c8cb84c0a9 Reviewed-on: https://gerrit.libreoffice.org/17493 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#93079: "resize shape to fit text" state can't be disabledJulien Nabet
Wrong copy-paste Change-Id: I7460c095c7bbb340be2cab32c4724688076c5952 Reviewed-on: https://gerrit.libreoffice.org/17477 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com> (cherry picked from commit 4a847bb4a2002d7f8f5854b7276ac67d369bdd3b) Reviewed-on: https://gerrit.libreoffice.org/17488 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-08-06tdf#92982 vcl rendercontext: set correct offset for the frame-level bufferMiklos Vajna
In case we had a toplevel window W1, the paint was triggered for window W2 and we had a sub-widget W3, then previously the buffer was created for W2, so the pixel offsets had to be set relative to W2 when rendering W3. As a consequence, if a single window was painted, then it was always painted in the top left corner. Now that the buffer is persistent and is always created for W1, make sure that we paint to the correct offset, and W3 is always painted at the same offset, regardless if it was painted directly, or just because it's a child of W2. With this, the buffer conents is closer to what is on the screen, even if it's not perfect yet. Also: - PaintHelper: restore set buffer properties - let PaintBufferGuard also manage pixel offset - no need to tweak map mode in PaintBuffer() Conflicts: vcl/source/window/paint.cxx (cherry picked from commits 94a6daa068f75c7196e79a8a4295c2a069ff4530, c36a00b811471b81abf189d80e07b5ff96243288, 28e465d2611adee62aac984a9c0bf731adcb793b and ec1a0354050491e84792a30df75d361803b62b1f) Change-Id: Ibf0e89ad18e5763bd2a01e69d91da163c24a309d Reviewed-on: https://gerrit.libreoffice.org/17518 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-08-06wizards: FileAccess.getURL does not work on WindowsMichael Stahl
The hard-coded "/" separator causes getFileURLFromSystemPath to fail, and it's not obvious why the URL is being converted to a system path in the first place. Change-Id: I06ebe6d92954c4f3c884ae6f0b327ea8a36c10a4 (cherry picked from commit 8bf374b98d07c24a37933b8c03a53abb3a8ff5c6) Reviewed-on: https://gerrit.libreoffice.org/17512 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#93041: Resolve clashing SID_OFFER_IMPORT vs. SID_ATTR_CHAR_BACK_COLORStephan Bergmann
...introduced with c1b9d61bacaf676d69a0f49a79fb086535f79a48 "tdf#88276: Add slot and handlers for toolbar|sidebar buttons" Change-Id: Ic63a7766b7f0ccae9144a0ef276e2df63fc22f2e (cherry picked from commit 4275056a90eb9e178062276cc104ac2b94db13ca) Reviewed-on: https://gerrit.libreoffice.org/17508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06sal: partially revert a251fe4d48237a4d9c9530dafc7bbdce6028e9cfMichael Stahl
The change to sal/log.hxx affects extensions too which are not required to use a C++11 compiler. Change-Id: I3ed08f9a02a2e082fcdb821bce84244597f2390a (cherry picked from commit f168fcaed2b30178ca6bf5ddb0f8f1763e10a8db) Reviewed-on: https://gerrit.libreoffice.org/17502 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06Add "styles" template folder + content to installationTomaž Vajngerl
Change-Id: Ibb674e17eedfc325d3e335aa074391ad7b2b2aa2 (cherry picked from commit 6c853a986444294dd937cd570a4dc0a31943e432) Reviewed-on: https://gerrit.libreoffice.org/17486 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06Change "Design" sidebar deck iconTomaž Vajngerl
Change-Id: Ibb4a308cfae3598e4d4e9759806c48f6a581bc83 (cherry picked from commit 8a323729e5755a26fd1726b0ac3159050fce8fe6) Reviewed-on: https://gerrit.libreoffice.org/17485 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#92903 KDE4: fix listbox regression from 92115Jan-Marek Glogowski
So at least in case of the CTRL_LISTBOX, getNativeControlRegion is called for a type and part unsupported by IsNativeControlSupported. For whatever reason, this results in broken listboxes drawn in Base's "Table Design" dialog, when selecting "field type", which draws the listbox on top of the cell. To make it worse, it seems the listbox is actually drawn to a smaller space then the actual requirement. Appearently it seems to use the content rect, instead of the bounding rect. So in addition to fixing the drawing, this patch increases the listbox bounding rect, which looks too large in normal dialogs, but makes the Base's listbox better readable. Change-Id: I112ec038fd20ad33facd260d16b5d68b508d2bd0 Reviewed-on: https://gerrit.libreoffice.org/17438 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit ef126328c3ad35d51395abc461c3d64429f91c26) Reviewed-on: https://gerrit.libreoffice.org/17448 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06Access2Base - Errors in CommandBarControls collectionJean-Pierre Ledure
- correct return value in Execute method: returned alays False, should return True when successful - Item property of collection did not work because incomplete object initialisation Change-Id: I9b2e682afb21747766e918bf905e35d9485b751d Reviewed-on: https://gerrit.libreoffice.org/17351 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#76845: wizards: fix Web wizard XSLT deadlock on WindowsMichael Stahl
The web wizard runs some XSLT over the exported file. It registers a handler that is called when the output stream is closed, and this Process.streamClosedHandler() calls terminate(), which causes the deadlock, because it wants to join() the extra XSLT thread but the handler is actually called from the XSLT thread itself. Fix that by moving the terminate() to another function that runs in the main thread. It does not deadlock on Unixes because osl_joinWithThread() actually detects an attempt to join the calling thread and returns early. Change-Id: Ia176562fa28b97c7e8956c1e8975c9aa6ee23236 (cherry picked from commit 62de18ab98289fc80984299f13ad71e4a4452ea3) Reviewed-on: https://gerrit.libreoffice.org/17511 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#91588 re-enable select button in draw toolbar in sw & scYousuf Philips
Change-Id: Iab1f29925c26e9cc862bb858d72eb528e656215b Reviewed-on: https://gerrit.libreoffice.org/17475 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 6860400666683d9e42b8de89bc189721527956e3) Reviewed-on: https://gerrit.libreoffice.org/17501
2015-08-06tdf#92982 vcl rendercontext: no need to call SetupBuffer() twiceMiklos Vajna
No need to call it in PaintHelper::StartBufferedPaint(), which would happen only for the root of the paint hierarchy. It's enough to do it in PaintHelper::DoPaint(), which happens for each widget. (cherry picked from commits 27f6b2c038f5daf16a7fff4adf478b603eb08399 and 8bb963c3e51725fba649a5db0f5deb8778f1232b) Change-Id: Iaf3306ef746bedbe64be36c4efeae73afd75db2a Reviewed-on: https://gerrit.libreoffice.org/17500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-08-06tdf#91594 misinterprets letters from Symbol font in docx filesMark Hung
Fix the issue caused by wrong assumption about symbol chracter and symbol font attributes order in writerfilter. Also allow symbols to be displayed if user's language is not Western. Reviewed-on: https://gerrit.libreoffice.org/16543 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Conflicts: writerfilter/source/dmapper/DomainMapper.cxx Change-Id: I602d9fbfa79c33c90f655dbf5ee22738b6391ae6 Reviewed-on: https://gerrit.libreoffice.org/17457 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#83223: sw: fix Undo of format change of conditional para styleMichael Stahl
SwUndoFormatAttr was simply missing a case for RES_CONDTXTFMTCOLL. Handle it the same way as an oridnary paragraph style, which seems to work for me. Change-Id: Ib529beb1116633e4890d5b51df39da21de485db9 (cherry picked from commit 37e936996acb4a8329fad2ec73a35f66be446e90) Reviewed-on: https://gerrit.libreoffice.org/17428 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#92982 vcl rendercontext: set buffer size in ImplHandleResize()Miklos Vajna
Instead of in PaintHelper::StartBufferedPaint(). If the buffer size is set to match the size of a sub-widget (for which the paint was triggered), then client using the buffer as a persistent vdev are unable to paint at arbitrary locations. For example, if we painted the ruler, then the blinking cursor won't be able to paint to the SwEditWin area. (cherry picked from commits 161f7533ac177c25516ec206233936bd6982e3df and 43ac95ab64980ed958ba144c33971f897791d15f) Change-Id: Iba07070baafb5b802fc6da200696611afd2010d7 Reviewed-on: https://gerrit.libreoffice.org/17490 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-08-06gdb pretty printers for boost can't iterate with Python 3Michael Stahl
Change-Id: Ie2d1cb7312de6f14a5c6de81eefd7a00be6f75c0 (cherry picked from commit 396643d46a778539f2bde30569d35ec05d7d867b) Reviewed-on: https://gerrit.libreoffice.org/17421 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-08-06RepositoryExternal.mk: missing dependency on python3 packageMichael Stahl
This was causing all these "libpython3.3m.so: file not recognized: File truncated" failures. (cherry picked from commit 57dd4d01c1ba036e5da4abf986b8d594d0ccdb95) RepositoryExternal.mk: for some reason Mac wants a GeneratedPackage (cherry picked from commit d9162d24ce242f27f9cc0430f0650daac8e5db24) Change-Id: I5d983fee8d5cd313fbd0d6ece800fa8b80d81b35 Reviewed-on: https://gerrit.libreoffice.org/17398 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2015-08-06tdf#92918 Engineering notation lost with Add/Delete Decimal PlaceLaurent Balland-Poirier
With scientific format, use the trick of thousand separator to detect Engineering notation. Change-Id: I7acdfb8bec646f9d6c1a17c334b60fa9708c8111 Reviewed-on: https://gerrit.libreoffice.org/17406 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit f4bdd7989f237e8e90ac94c2798e0ea0fb31af6b) Reviewed-on: https://gerrit.libreoffice.org/17440
2015-08-06tdf#92765: Show the real icon instead of a black square with gtk vclplug.Jan Holesovsky
This partially brings back the behavior before 10a3db37377a68ec7529bbfbf876c852d58b7ae4. Change-Id: I5b372ab56105c05dda6ecb9aa1eed1c6a0c72ea8 Reviewed-on: https://gerrit.libreoffice.org/17420 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2015-08-06tdf#92982 vcl: stop creating/disposing the paint buffer in PaintHelperMiklos Vajna
Instead: - create it early in Window::ImplInit(), except for the default window (that one is a chicken-and-egg problem, as creating a VirtualDevice invokes ImplGetDefaultWindow(), but creating the default window then would create a VirtualDevice) - only erase the painted area of the buffer, don't create it - use a separate bool in the frame state to track if we're in the middle of a (possibly recursive) buffered paint And with that, rename CreateBuffer() to StartBufferedPaint(), as it does not create the buffer anymore. Change-Id: Ib33e8afa36977aa809f0ea2158a369f288cba8c7 (cherry picked from commit ea5e83abcfa1406c401b8a1ec91efda65373b74b) Reviewed-on: https://gerrit.libreoffice.org/17445 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-08-06tdf#92982 vcl::Cursor: handle rendercontextMiklos Vajna
With this, vcl::Cursor does not paint on the vcl::Window directly, and in case the output should be something other than pRenderContext, it should be a one-liner change to do that. (cherry picked from commit 79c9598d0a586f44757954556661ce6eda1f997e) Conflicts: vcl/source/window/cursor.cxx Change-Id: I57833f6f8589286260d96f412f1fcc681e6c5c8c Reviewed-on: https://gerrit.libreoffice.org/17433 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-08-06update creditsChristian Lohmaier
Change-Id: Ibb7500527d0ff142a6ba89a20894258cb63eeed5 (cherry picked from commit 2d9db406d301d722649ca539cacad823b89191ca)
2015-08-06update emoji autocorrect entries from po-filesChristian Lohmaier
Change-Id: Ia3931f3cac13894ccd51772312110367194e19c6 (cherry picked from commit 8552e92873911ddbcb9b8b62f0cde0a0f2c81fe6)
2015-08-06tdf#93004 msi banner: avoid overlapping text with grey backgroundChristian Lohmaier
by reducing the width of the graphical element Change-Id: Ie100629e2602f8f9a3f0e4e1ba353178f219c9a0 (cherry picked from commit 303b7758e90e11aedef95e4ab51b74398cd2ce0a)
2015-08-06API CHANGE: remove update() from X3DChartWindowProviderMichael Stahl
Revert the API change from e41c33b376d8b5776e400979eb8544db596c5bbe and use the existing css::util::XUpdatable instead. Change-Id: I3eba4c7def98c8765a970d54a7fe84a320d4313e Reviewed-on: https://gerrit.libreoffice.org/17382 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 41d1b01a906ed5872cc8f0b70439c6891a874f60)
2015-08-06tdf#92982 vcl rendercontext: move buffer from PaintHelper to ImplFrameDataMiklos Vajna
With this, code that wants to take a persistent render context (e.g. vcl::Cursor) will be able to do so. This commit just moves the buffer, though: it's still created / deleted by PaintHelper. Having it in ImplFrameData means that we'll have one buffer / one system window: i.e. toplevel window and its sub-widgets share a buffer. (cherry picked from commit a33e0379bbe2c7651315f5cdc5925adab33b573b) Conflicts: vcl/source/window/paint.cxx Change-Id: Ic37220a2a483a7389aa04cd4313b6fc61a5408bf Reviewed-on: https://gerrit.libreoffice.org/17414 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-08-06tdf#93007: Add missing build dependencies for *rc files.Jan Holesovsky
(cherry picked from commit 86d2cddad3d4529cd877debaf258256cb07f5631) Change-Id: I0a876e9afa9a90f312d68611a8adf5a962da784d Reviewed-on: https://gerrit.libreoffice.org/17413 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#92982 vcl: move Invert() member functions from vcl::Window to OutputDeviceMiklos Vajna
With this, vcl::Cursor will be able to paint to a vcl::RenderContext, too; not just directly, which is needed for double-buffering. (cherry picked from commit 09bd5846d57bf6b506b0967d664b2f80562e03fc) Conflicts: include/vcl/window.hxx vcl/source/window/window2.cxx Change-Id: I868f6cd9b08afe59611ef266911a894a26cacedc Reviewed-on: https://gerrit.libreoffice.org/17401 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-08-06tdf#92914 SwPagePreviewLayout::Paint: handle rendercontextMiklos Vajna
With this, the print preview window no longer performs direct paint. (cherry picked from commit 46e7991be05a39a24e0a559db6ff1aea0ebc14e5) Conflicts: sw/inc/pagepreviewlayout.hxx Change-Id: I53f05d8a3b723bc131f21a485e0ffec71484670a Reviewed-on: https://gerrit.libreoffice.org/17394 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-08-06dtrans: reset DropTarget::m_pDropTarget if it is releasedMichael Stahl
JunitTest_forms_unoapi_3 just crashed in DropTarget::disposing() with m_pDropTarget pointing to garbage. Change-Id: Icb5ad15a3d4b857b45553543d404e14abbac4374 (cherry picked from commit 372d416692e0f5a6f1a3a97ff6f967eaab54233c) Reviewed-on: https://gerrit.libreoffice.org/17388 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#92914 SwPagePreviewLayout::MarkNewSelectedPage: avoid direct paintMiklos Vajna
With this, when the user select an other page in the print preview window, the selection rectangle is no longer painted directly. Change-Id: I85f1cb9d09c8545222ed49ff0acf819540d10920 (cherry picked from commit da24bd36a5213670b5636abf4dbac317c4135c07) Reviewed-on: https://gerrit.libreoffice.org/17381 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-08-06tdf#92914 SwPagePreviewLayout::_PaintSelectMarkAtPage: handle rendercontextMiklos Vajna
With this, the print preview window does not paint the selection rectangle on opening directly anymore. (cherry picked from commit 0c114151343cbe6853dd46833c42368d738afd8a) Change-Id: Ie4d24dfc4d64c74b22dcd1476778f4eac6f4cd13 Reviewed-on: https://gerrit.libreoffice.org/17363 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-08-06configure: make --enable-selective-debuginfo less errorproneMichael Stahl
Change-Id: I6b7379323a86242b42a8a5137807c535bf1d7c46 (cherry picked from commit 6be72cc21cd59e6cb3c4dcda9416d1ab362f0a14) Reviewed-on: https://gerrit.libreoffice.org/17374 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#92130 fix DoEvents to be recognized as keywordMarek Doležel
Change-Id: I24868acec66a72abbb52b8026ed3a092dbd97632 Reviewed-on: https://gerrit.libreoffice.org/17347 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 11f24bc2f032b31095663cb09ef948eee2c61f49) Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-08-06gdb pretty printer for SwNodes fails on Python 3 due to "unicode"Michael Stahl
Change-Id: I8e4983a91d4f97a2a20fbeed89d4e0f186c35fad (cherry picked from commit f29ac1d91b12ab2f55d7ab7afce62238a59b8cba) Reviewed-on: https://gerrit.libreoffice.org/17373 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2015-08-06Resolves: tdf#91950 optional entries may not be presentCaolán McNamara
here we appear to check if the preceding optional entries are of certain types. Presumably if they are optional then its legal for them not to exist at all, just that if they are there they should be in the right order. Change-Id: Id147b91d7d375d7985d901cda112c7757dc3fb19 Reviewed-on: https://gerrit.libreoffice.org/17353 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06Resolves: tdf#90609 SolarMutex assert on threaded loadCaolán McNamara
Change-Id: I81a784ab506d0d3ae266d7341b8ff7a163dcd8d2 (cherry picked from commit 442b788bc80e20783bdb881aa0cbbc253f1a47b0) Reviewed-on: https://gerrit.libreoffice.org/17327 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-08-06tdf#86374 DOCX import: fix btLr text table direction without <w:cantSplit/>Miklos Vajna
Commit 0208ead70a9412ccd554fcef3e9308f8ca17037b (DOCX import: improve btLr table cell support, 2013-02-22) made any table row that has at least one btLr cell fixed height. This causes problems in case a table has a minimal height with lots of content, where the fixed height gives wrong layout, but the minimal height is correct. Fix the problem by only making the row fixed height if <w:cantSplit/> is set (as seen in the old bugdoc), and revert to setting the height type to minimal in any other case. Change-Id: Ibaf91f542e64e5caa7904df97eb6eb52618e0023 (cherry picked from commit 233a634a112e6dae07dca5fb1296764cb0001503) Reviewed-on: https://gerrit.libreoffice.org/17338 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-08-06tdf#92792: Register mork driver on windows 64bit and make it workDavid Ostrovsky
Mork service wasn't registred on windows as it was generally excluded on this platform not matter what architecture was used. Pofile discovery was broken, as XP_WIN wasn't define and the code fall back to use UNIX directories for profile discovery on windows that obviously cannot work. Change-Id: I823378a1a094a2172ba2cb3bf9bdacedb27b36a2 Reviewed-on: https://gerrit.libreoffice.org/17350 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>