Change-Id: Id7157ea5fadd684dceec52f69ec9279c4107b5f1
(cherry picked from commit 9feffdbe)

Change-Id: I46caceed3fdf0ad0aa51c8a8ede1177ca3d1855e
(cherry picked from commit 506432f5)

Change-Id: I19efc6050c78162e0889437d4c8285d1a6714e82
(cherry picked from commit be28ab9a)

(cherry picked from commit 479325de)

Conflicts:
	sc/inc/docuno.hxx
	sd/source/ui/inc/unomodel.hxx
	sw/inc/unotxdoc.hxx

Change-Id: I9a6a75457078dc6383673f4c1a2012b69b5cefdd

(cherry picked from commit 4bddfc00)

Conflicts:
	libreofficekit/source/gtk/lokdocview.cxx

Change-Id: I8aaf19a50f25f495cb87fba7ff6a4b0f56ed7d80

Change-Id: I9e48407f6f5eb5cc4c36439b72648bb8d43deb79

...re 2c346d66 "tdf#39080 Hide Whitespace UI
option added to the View menu."

Change-Id: Ib2f364dba7a50854a11f004b42c7ee22ee10e48b
(cherry picked from commit 6efbd4bb)

Regression from commit 54a2c8c0
(tdf#39080 Interactive hide-whitespace mode, 2015-08-30), the problem
was that SwPageFrm::IsOverHeaderFooterArea() checked if the header is
active before accepting that the user clicked in that area.

Don't require an active header at least in non-hide-whitespace mode, as
the member function is used in the "could there be a header here" sense
in SwEditWin::MouseButtonDown() to show the controls that allows
actually adding a header.

Change-Id: I6f905920113aed1512e333e718a8f26d88a3245d
(cherry picked from commit a23f85f1)

Browser and Hide Whitespace page height now use
SwPageFrm::GetContentHeight, which is const.

A few improvements are done for both paths as well.

Reviewed-on: https://gerrit.libreoffice.org/19730Tested-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 f05da45c)

Conflicts:
	sw/source/core/layout/calcmove.cxx

Change-Id: I73a8e920ccfa96d76cbbb002bed6a85f2e636ede

Change-Id: I4be589325b89eac129328f98f9db7ce8c741892d
(cherry picked from commit 705c0edc)

Moved the page resizing from SwLayoutFrm::Format to
SwPageFrm::MakeAll and calculated the new page height
more accurately based on the content (stolen from
the browser-mode height calculation, to be refactored).
This fixes issues with repagination with certain contents.

Removed unnecessary ToggleLayoutMode calls and
prevented clicking between pages in single-view
mode to jump the cursor.

Reviewed-on: https://gerrit.libreoffice.org/19699Tested-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 40f3a942)

[ Miklos Vajna: adapted to build with non-prefixed SwPageFrm. ]

Change-Id: I5662dd26efff66d6e95b8fd4dcf8564588adbbb7

Change-Id: I5353b78b6961d28fb3f42e5f2073e9a83ac1037c
(cherry picked from commit 13fdf04f)

Support for enabling and disabling hide-whitespace
by clicking between page frames.

Disabled header and footer decorators when
hide-whitepsace is enabled, and page size
is trimmed to the contents of each page.

Experimental/suggestive mouse pointers added
but only tested on Windows.

Change-Id: Ia2faeeda9e3e783ffaf5340aa69303a4218892a7
Reviewed-on: https://gerrit.libreoffice.org/18156Tested-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 54a2c8c0)

Change-Id: Id34ae93ccbb020f09c608f34e5f41a8622cf1607
(cherry picked from commit f7bc163c)

Merged Hide Whitespace with Browser Mode and hooked
the former with the UI. In Hide Whitespace mode
the headers and footers are removed and
page margins as well as between-page gaps are
reduced to minimum.

In single-page view the side margins are left
as-is. In multi-page and book-view the sides
are removed, however, they have twice the
width of the top and bottom.

Printing and PDF export disable this mode.

The usable screen real-estate is greatly
improved in this mode, which is controlled
from the View menu.

Change-Id: I2d0075ae9a76162c26c78e9eb23a71920cdfc522
Reviewed-on: https://gerrit.libreoffice.org/17281Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 2b8e62f7)

Change-Id: I1f9ba9ef489159ca54db802393d958d7fd6ac8ff
Reviewed-on: https://gerrit.libreoffice.org/17280Tested-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 2c346d66)

Change-Id: I1d0a974a0b4b7053f59c23aa883bef61fd1df177
Reviewed-on: https://gerrit.libreoffice.org/17279Tested-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 17ac8354)

Change-Id: I0f45b1a6ab198a8403073eea05497e76f758250c
(cherry picked from commit 4890ae51288c2c571e85a1536cb6c8f44681bd25)

Change-Id: I3310813c971aa7abffccc0b7f462e05caa83482e
(cherry picked from commit 50bdd588d39a23d44d2d2111256f5e505c7165af)

When tiled rendering, then only the render context (or failing that,
SwViewShell::GetOut()) has the correct zoom level, so use that when
doing pixel-to-logic conversion or scaling pixel values.

Change-Id: I265a642b8253c6eced42da2a0e06a2de25c36ca8
(cherry picked from commit 8a249d38e94098b300fb4f49cb4a44960027fa20)

SwPostItMgr::GetSidebarWidth() can be called in two scenarios:

- inside PaintTile() the output device contains the zoom level and has
  the map mode enabled (and its scale factor is the zoom level)
- outisde PaintTile() the output device is SwEditWin and has the map
  mode disabled (and the zoom level is to be taken from the view
  options)

Change-Id: I6cf19f3241a2e972ae711e0efa7b0205aae1a3f2
(cherry picked from commit acec324b0c753877cf913e8064c02603307b5ebb)

Change-Id: I6772cce10d157421d983d6b93efb52bf8b95f5b8
(cherry picked from commit dc65f048)

Change-Id: I9f0e693aa48ed6a1ace8b9cdfd1b1db2f3379215

Change-Id: Ice54f6c89eb2a2492d2b55a3f4edb13df4192446
Reviewed-on: https://gerrit.libreoffice.org/19985Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 055c248e)

void UnoControl::setDesignMode calls setVisible on the XWindow
so it seems sensible that FmXGridPeer::setDesignMode should
also do so. The desirable side effect is that moving the window
in design mode then is moving a un-shown window so nothing
is invalidated so the paint loop doesn't happen.

Change-Id: Ic5a4ba62590372bec15a29b993b73d6dfb94a8a9
(cherry picked from commit a7816853)
Reviewed-on: https://gerrit.libreoffice.org/19906Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit a08a5ff7)

Change-Id: I937ed893dfd9919bf48b8fd38a1b83c524200532
(cherry picked from commit 6128c10f)
Reviewed-on: https://gerrit.libreoffice.org/19911Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 82c0f2eb)

The missing convertMm100ToTwip() calls mispositioned the line shapes
inside the groupshape in case of using drawingML inside DOCX files.

(cherry picked from commit 11129d89)

Conflicts:
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx

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

Remove listener we add, and don't crash on callback for disposed dialog.

Reviewed-on: https://gerrit.libreoffice.org/19936Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 45c6d948)

Conflicts:
	svx/source/dialog/imapdlg.cxx

Change-Id: Ia6a1bddd212cb28a0331469e8e87324346d02841

(cherry picked from commit d5016b01)

Change-Id: Ief31d8153fdbf91cdd29df5ac7801bd88a98542e
Reviewed-on: https://gerrit.libreoffice.org/19955Tested-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 d11d0915)

implementation can indeed be empty when cppu::writeSharedLibComponentInfo calls
getEnvironmentFromModule(mod, curEnv, "", ""), which in the final if-branch
calls getEnvironment with implementation = "".  Happens when adding desktop/qa's
test-active.oxt.  Regression introduced with
ae3a0c8d "Add .component <implementation
constructor='...' feature."

(cherry picked from commit 97464be9)
Conflicts:
	cppuhelper/source/shlib.cxx

Change-Id: Ia70958e4aa18d378ff35063bdf6187f6e073b765
Reviewed-on: https://gerrit.libreoffice.org/19956Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 2466c85c)

Change-Id: Ief5c2effbddebe29fc7a4d38ed0af4fed72de40e
(cherry picked from commit e08fbe4c)
Reviewed-on: https://gerrit.libreoffice.org/19915Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit b4533424)

for gtk3. Probably also a fairly dumb idea for gtk2, but with the
extra unblocking opportunities it probably just "works out ok" in
that model.

Change-Id: I3d4716c691fc84a5e68c210fee51f9e31cfacc02
(cherry picked from commit f9dfd012)
Reviewed-on: https://gerrit.libreoffice.org/19929Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 11d0bacd)

Change-Id: I16ddac82a76a1e665797e4be192d3642f2660d9f
(cherry picked from commit 82abd23f)
Reviewed-on: https://gerrit.libreoffice.org/19933Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 5a1d267a)

VclPtr related, dialog dtor is never called, so timer
is never stopped and timer refers to deleted parent
data

(cherry picked from commit 0943adb2)

Change-Id: I804ba082817802c0017e61c6b86c5d3694995ea8
Reviewed-on: https://gerrit.libreoffice.org/19926Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit 33df62ef)

The problem was always masked out the combination ALT+CTRL, this only
needed when press the ALTGR key, but the other ALT-Key (left side) is
valid.

Change-Id: I8a6f953f519627418fb48ee8d1d68b3cbf797250
Reviewed-on: https://gerrit.libreoffice.org/19923Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/19932
(cherry picked from commit 0ff2015b)

Change-Id: Id584edf091aebd95bb71d7efd2df6fdaa511c837
Reviewed-on: https://gerrit.libreoffice.org/19875Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 131a1962)
Reviewed-on: https://gerrit.libreoffice.org/19920Tested-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 ec0da57d)

Regression from commit 866a4436 (oox:
handle textboxes in ShapeContextHandler::endFastElement(), 2014-06-04),
the problem was that code in ShapeContextHandler::endFastElement()
assumed that all the XShape implementation it may see provides a TextBox
UNO property (which is specific to Writer) of type bool, but this is not
true.

Fix the problem by assuming false in case it has an other type.

Testcase can be a simple "does it load" one, as in the meantime
exceptions such as trying to read a bool from an uno::Any make the DOCX
XFilter::filter() implementation return false, unlike in the originally
reported LibreOffice 4.4 version that just silently discarded the
remaining content of the document.

Change-Id: I81781a7ec28d085ceee50d386b8eda023f83c29f
(cherry picked from commit 4cae3689)
Reviewed-on: https://gerrit.libreoffice.org/19905Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 2c43db1e)

blendBitmap24 assumes bitmap is 2 lines high for doing
interpolation. For bitmaps of height 1, really nothing to interpolate
there. Fix cornercase by 'blending' between the very same line instead.

Reviewed-on: https://gerrit.libreoffice.org/19863Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>

Cherry-picked from 99e3ab6e

Change-Id: I9b94000aa563e525d0bb2418346ad2c86af26df8
Reviewed-on: https://gerrit.libreoffice.org/19888Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 5a86268e)

Change-Id: I85000851f82ea7cdc4b536683adbc8570de9af7e
(cherry picked from commit 396b5f41)

We need the callback to be able implement the formula bar

Change-Id: I1c78ab0b9ed9304c0465a9993a7101f8efb91052

Conflicts:
	include/LibreOfficeKit/LibreOfficeKitEnums.h
	libreofficekit/source/gtk/lokdocview.cxx

Conflicts:
	libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
	libreofficekit/source/gtk/lokdocview.cxx