Age | Commit message (Collapse) | Author | Files | Lines |
|
This reverts commit 6e61ecd09679a66060f932835622821d39e92f01. Better not
to have this on libreoffice-4-3 without
7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step
of DrawingLayer FillAttributes..., 2014-06-02).
Conflicts:
cui/source/inc/backgrnd.hxx
cui/source/inc/cuitabarea.hxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/tparea.cxx
include/basegfx/numeric/ftools.hxx
include/svx/svxids.hrc
include/svx/unoshprp.hxx
sc/source/ui/drawfunc/drawsh.cxx
sd/source/ui/func/fuarea.cxx
sfx2/source/dialog/tabdlg.cxx
sw/inc/fillattributes.hxx
sw/inc/format.hxx
sw/inc/frmatr.hxx
sw/inc/swatrset.hxx
sw/inc/unobrushitemhelper.hxx
sw/qa/extras/rtfexport/rtfexport.cxx
sw/source/core/attr/format.cxx
sw/source/core/attr/swatrset.cxx
sw/source/core/doc/docfly.cxx
sw/source/core/doc/notxtfrm.cxx
sw/source/core/inc/frame.hxx
sw/source/core/inc/frmtool.hxx
sw/source/core/layout/fillattributes.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/txtnode/fntcache.cxx
sw/source/core/uibase/shells/frmsh.cxx
sw/source/core/unocore/unobrushitemhelper.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unostyle.cxx
xmloff/source/text/txtexppr.cxx
xmloff/source/text/txtprhdl.cxx
Also:
Revert "cppcheck: Prefer prefix ++/-- operators for non-primitive types"
This reverts commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93.
Revert "WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'"
This reverts commit d5d10b03b1f3e4bf784ad35254cb55d719a8c1b3.
Revert "i#124638 support for DrawingLayre FillStyle for GraphicFrames and ..."
This reverts commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c.
Revert "svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID"
This reverts commit b66d87086804460c1986df1b832fd6b2ea075a90.
Revert "SwXStyle::getPropertyValue: don't try to read a float into a sal_Int32"
This reverts commit 1e3c7b854baac2502bed72ff8e3e1b21b507735b.
Revert "SwXTextFrame: also restore semi-lost BackColorTransparency property"
This reverts commit 102bb87ca1a5dee3a09442bf503a54bb703c79ea.
Revert "SwXTextFrame: restore semi-lost BackColor property"
This reverts commit 5ce92b73ce06c805c66e53c48aa2c70c722aaf60.
Revert "DocxAttributeOutput: port to FillAttributes"
This reverts commit ec221b7339f8fe5520926ef85b450daa94392780.
Revert "MSWordExportBase::OutputItemSet: handle fill attributes as frame ones"
This reverts commit 84c40768f8acb0342dcfa223133497f57620fc14.
Revert "sw: put getSvx* and setSvx* to a namespace, now that these are public"
This reverts commit ebf960960a69c1edb5da1994c330ddddbecac44d.
Revert "sw: fix DOC/DOCX/RTF export of TextFrame background color"
This reverts commit c7837b8caad61b8c0dfd3704a133cdeaffd69b06.
Revert "sw: still use SvxBrushItem for page style background"
This reverts commit e826950e9d7736a6e3f9042755ba1b528f58a505.
Revert "cui: unused code in SvxAreaTabPage::ClickBitmapHdl_Impl"
This reverts commit 2032e9f5d7683e49b8753d7c7362899c690005b6.
Revert "cui: unused code in SvxAreaTabPage::ClickGradientHdl_Impl"
This reverts commit f4fa202b31277276dc4f05046c82152c0830ef21.
Revert "cui: unused code in SvxAreaTabPage::ClickColorHdl_Impl"
This reverts commit 1478e89e08a54f02a137c74c0cde6ae75e80d9f3.
Revert "cui: unused code in SvxAreaTabPage::ClickHatchingHdl_Impl()"
This reverts commit e9c9f3f793a91525ac4fb74f8791ba74222515e4.
Revert "svx: fix Writer's insert -> frame crash"
This reverts commit 831b8751fc9f423fd4e459623e54801c0a020eb3.
Revert "sw: adapt frame/templatedialog4.ui to FillAttributes"
This reverts commit 55916fc50a5b2d6273bca8c9ef6253011cf4fdbc.
Revert "-Werror,-Wunused-variable"
This reverts commit d0542fe7251d9c6538331b22a4b5e2e294a92e97.
Revert "loplugin:implicitboolconversion,literaltoboolconversion"
This reverts commit 47862e75de51a4ac7476acff773b504fdc0d6e76.
Revert "loplugin:saloverride"
This reverts commit be89e8b8ac19c0feca8850ccaddd90205c63dbe5.
Revert "loplugin:literaltoboolconversion"
This reverts commit 355b31fe347479f63906e41300042ec5cb38837c.
Revert "-Werror,-Wunused-private-field"
This reverts commit df9d13dd2e754184a4c6e321b8910ee1bc0cafa1.
Revert "-Werror,-Wunused-const-variable"
This reverts commit d757a98001a65baf4066c2eda037a08ab1beda46.
Revert "unused XFillStyleItem ctor"
This reverts commit b735fe1d67e6ad7ad448e448f237dcabef1a1c38.
Revert "unused XGradient::VclGradient"
This reverts commit 5bbc90be755aae4b87125f9d748828d74efe645d.
Revert "fix "transparency" of floating tables in docx import (fdo#77723)"
This reverts commit 313b59d787357ef3da34e2833fefcf1143b09b5e.
Change-Id: If855b090f94288d384f8733f88ef1172e68c50a6
Reviewed-on: https://gerrit.libreoffice.org/10077
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit dc17dad5fd7509f191718df8690e5847ab87669a)
Reviewed-on: https://gerrit.libreoffice.org/10086
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
|
|
In particular, EDIT_BAR, EMBEDDED_OBJECT and HYPER_LINK were being
mapped to custom roles when specific roles exist; fixed passing the
proper name to registerRole.
Besides, moved two roles that were in the section 'don't exist in ATK
yet' because that's not the case now.
Change-Id: I6818a0ac623f45053812b5c6dd5fc25c9abf4f65
(cherry picked from commit 7c37cd7bb26b91bda5e57d7bd0cecdbc9d1ebb22)
Reviewed-on: https://gerrit.libreoffice.org/10067
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
in the CoreText engine
the concept of an extra-width per code-unit was obsolete at least since apps
supported unicode with its different normalization forms, diacritical marks,
surrogate-pairs, non-printing characters such as ZWJ/ZWNJ/RLM, etc. so of
course modern engines like CoreText don't aid this typographical crime.
The fix here extends the CTLayout::GetTextBreak() method to handle the obsolete
semantic of per code-unit extra-widths by successively approximating the number
of involved code-units.
(cherry picked from commit a9b9ceff86f35be1eeff5f251d24e338db760a1e)
Conflicts:
vcl/aqua/source/gdi/ctlayout.cxx
Change-Id: I52a7f7488a9e8a303ed7271df2a24a3c85098ce3
(cherry picked from commit 687f0c9300d499b78deea2890b4c2019adb2d67d)
Reviewed-on: https://gerrit.libreoffice.org/9627
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
There is an off-by-one error in OutputDevice::ImplDrawLinearGradient()
that causes the bottom line to remain black.
(regression from 04d937c1ec36c2d9fa8c90604c81a37d30e97da6)
Change-Id: I33948ec8065e446a9ec7efeab5e506c93fa2e9e8
(cherry picked from commit d51f53fedb8cd68b1b3122c7199c4ea2d3a6980f)
Reviewed-on: https://gerrit.libreoffice.org/10024
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Building, and running the unit/subsequent test on Mac cause massive amount
of flashing windows creation/destruction that make building with test
very annoying on a box used for other purposes.
This patch prevent the windows to be actually displayed hence mitigating
the problem
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Conflicts:
vcl/source/window/window.cxx
Change-Id: Ied2a36699b50856e0c4e6b618212481796ec99d3
|
|
Change-Id: If7fd95287ba1a28e7b5f5440776859b912d6ad6e
(cherry picked from commit d781e874e018988d26b558ae1e4d6a1303b14cc1)
|
|
Change-Id: If0c9950c18e6091fafea47954a4654db436a3a44
(cherry picked from commit 986c0451d05e7bb6ff7edd9f27d0e45532bcd22c)
|
|
Change-Id: I445ce672742ddb6d6592ef419bf5e14c5f09a5b5
(cherry picked from commit be9d65bb5f5a83c19eec02a037b8f808de70ecb8)
|
|
Whee, seems hb has changed naming, with 0.9.11 it is spelled as
quoted. newer versions have a mapping in hb-deprecated.h ...
Change-Id: I425ded33e6b9928aadca9f6988437a021fcecbfb
(cherry picked from commit b3911e8adb34c6ee72577e58658b2cb72c6e79a3)
|
|
in CoreText
by doing the calculation before CTLineDraw() updates the text position.
Requesting the update early is possible because that update region is
not used until AquaSalInstance::Yield().
(cherry picked from commit ee042661b996fd00d5504caf4f4be60f77bf880f)
Conflicts:
vcl/aqua/source/gdi/ctlayout.cxx
(cherry picked from commit d2bbef3d3d6c7be096175ddbdb788ece5067f5fc)
Conflicts:
vcl/quartz/ctlayout.cxx
Change-Id: I317a2068071a2f6d33f34c81e104e30beedc33db
Reviewed-on: https://gerrit.libreoffice.org/9628
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
Rounding left and width down can accumulate a rounding error of almost two in
the calculation of right. The existing code compensates for this by increasing
the width by two, but since left has been decremented by one to accommodate for
antialiasing artifacts this compensation is one to few by itself and two to few
when accounting for antialiasing artifacts on the right. Y-pos and height have
the same problems and get the matching fix.
(cherry picked from commit 073ec69fb970830d39c8700317ee74dbbdfd1fda)
(cherry picked from commit ee9dd6c086f7bda615d5b28d3319a83ce1673607)
Change-Id: Ia394859035d59c76c67b6b0d53ddc6cf88582bfe
Reviewed-on: https://gerrit.libreoffice.org/9626
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
see commits:
c5c317ed20933c6508b35c34039df31669943f1c
Change-Id: I3a886bde11dc3620cffeb3e2e579c7b37285d9c5
Reviewed-on: https://gerrit.libreoffice.org/9759
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit e509b9303bd0141143bc6e707f98a72b96d91311)
|
|
fixes "error: ‘kCTForegroundColorFromContextAttributeName’ was not declared in this scope"
see commits:
5bc5387669bca8a0b410e295b0992fd2424a1536
Change-Id: Ifdf69ab2f9a6437d18a6d3e3f5d756beeed3ba5c
Reviewed-on: https://gerrit.libreoffice.org/9758
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 4af1b789545bc3815f79fafed5b1806b3c08b69d)
|
|
This conditionally reverts 0c7e6080519014f1fb345ed25e2f12c9a043b3ae.
Change-Id: I462016cd43c489fced7fb3739aa98c521d52f78e
|
|
Change-Id: Id25d27f77c43c5fa11ff03aa38edcaec762caf61
Reviewed-on: https://gerrit.libreoffice.org/9739
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I04cc155e69d25021d294bccc588450b1f20e1fde
|
|
Change-Id: I2451687c10f91e7d5242b04974cb7bdd745de51c
|
|
Change-Id: I810b42da1d62c66c2ab6fb7bb6f71d1d00115dfa
|
|
Change-Id: I611eefd20043386d00984f76a28d111e1c0495f1
|
|
Not sure if using lockFocusFlipped: has the same effect, but will
see...
Change-Id: I957874bcf59c2c521bd5b2b2ca6f44fb0400e64f
|
|
Change-Id: Iaf5de07b7f0da7294681b9cdc152575a756a73c7
|
|
NSTextInput was deprecated in 10.6.
Change-Id: I6bce9e91a68014a6ca28bff6a820c27817f9baaf
|
|
Change-Id: I7163d3821ac0dfc0d471cf31e98f72953c78d878
|
|
Change-Id: I5863de6d8b1f0fe2419ea7419b1ff90087bb513d
Reviewed-on: https://gerrit.libreoffice.org/9715
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit a5a17ccdbc870b475e6a2dc076a780b55e16ccab)
|
|
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8
Conflicts:
include/vcl/metric.hxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/stdmenu.cxx
svx/source/sidebar/nbdtmg.cxx
|
|
|
|
Change-Id: I82a517a267cceaac4dd1030d45c67fc070e22def
|
|
Change-Id: Id8adb7517960a33f9900cb773b62b84db71e795a
|
|
The chart object can be destroyed after the context.
Change-Id: I5ae370638f296ea314ee11680e0a8d81a8fdbe69
|
|
<Gdiplus::Bitmap> instance before using it.
(cherry picked from commit b127235917610b9c68e19df29bb39af496906569)
Change-Id: I97364cf963424b0e8d0b52b3c995bd4defdca067
(cherry picked from commit adb1bb21f804c62004f31ad5473d4cf447436b9b)
|
|
We reuse the toolbox overflow menu for toolbarmanagers context
menu -- toolbarmanager previously added its menu listener to the
toolboxes menu permanently, meaning that it would try to handle
overflow menu items (in addition to the context menu items which
it should handle), instead we should only add the listener when
we are actually using the menu as a context menu.
Perhaps it would be better in the long run to actually use fully separate
menus instead, and ask toolbox to specifically add its items to that
rather than trying to hack the context menu on top of the overflow menu?
Change-Id: Iecface2c6eae9ab79dbcdb25ffdbaf446e2885ea
(cherry picked from commit 1ae89d189200c1e351a396a3f02612b84a69985f)
Reviewed-on: https://gerrit.libreoffice.org/9604
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I7537f6d22780bace6ab6da06e087a3d27da8de05
(cherry picked from commit 53db456c04ca5a1684395b60fbd6f1bed4c9c114)
|
|
a) ptr is just added to offset, so move addition into 2nd arg
Change-Id: Ia3e8145c69324f19aeec8b0dd97284ec382d20d7
(cherry picked from commit 57ef375bed4480bbedc799aca274a6bd26745008)
b) sort in order of increasing offset
Change-Id: I0d2c880438f47f4527037d7ffaf77cf142d24751
(cherry picked from commit 95e92889d3fb0e8a85cefdeb07a02e57130a9799)
c) fdo#78477 ensure offset + sizeof(value) is in bounds
check that largest offset + value to read is inside available space
Change-Id: I4feac37bdfbae5061b3b75ddf44bb20fc5904656
(cherry picked from commit c888c211072f23cfb4cc488c641d8d822f930a33)
|
|
for CoreText-layouted text
(cherry picked from commit 42f9768f771457c53a9f1e6a3581b2df9856401f)
Conflicts:
vcl/aqua/source/gdi/ctfonts.cxx
vcl/aqua/source/gdi/ctfonts.hxx
vcl/aqua/source/gdi/ctlayout.cxx
vcl/source/gdi/outdev3.cxx
(cherry picked from commit 507efabe8b40e34c2bebfdaa00d4264c5345d3dd)
Conflicts:
vcl/quartz/ctlayout.cxx
Change-Id: Ie2685ab80ca87ea72e25f18d02f883fb36c24a36
|
|
It actually is so that the line is in the output PostScript; and it is even
visible sometimes when you zoom the file (like, when you are zooming
continuously, the line is appearing and disappearing).
I guess it is a corner case of the clipping, highly dependent on the exact
settings, so let's be more relaxed and clip a bit less (as we already do for
right/bottom).
Hopefully some other functionality does not depend on this exact clip
setting ;-)
Change-Id: I7080ad3ff730408296f9e9dec7a0b74ac4afca7d
|
|
It's used in ImplFontCache::GetGlyphFallbackFont.
This is fix for commit a6b00d16eb27a5e7e31c721671001a909ecef960,
which caused huge performance regression for document in fdo#59882,
fortunately immediately detected by loperf.
Change-Id: I475742b5249f106d34c4f6c43b1e39e9bb7b897a
(cherry picked from commit 16a62079018aea0e72636bdb00576487b4e830b9)
|
|
Otherwise we never hit cache directly, only after expensive call to
ImplFindByFont.
Change-Id: If15b368feeba94c8fff8ee7cbe049fc4a2069768
(cherry picked from commit a6b00d16eb27a5e7e31c721671001a909ecef960)
|
|
30bb1eddba2b4a36b4354303ffcb37a3a15f38a6 originally incorrectly
changed some different 16bit numbers to 32bit, then
02abb559fb506e3d3911bbf058c9a60d28b0a3b5 reverted those 16bit->32bit
changes but accidentally changed the 32bit nAryLen to 16bit but
that was 32bit before 30bb1eddba2b4a36b4354303ffcb37a3a15f38a6
Change-Id: I36863b62418d7a3b5ccce51aef86c63c523f9598
(cherry picked from commit 5326c563463a8682e0433c0badf39657446f1053)
|
|
Change-Id: I5d5066413508a115f6b4c63b8b3dd19268f66574
(cherry picked from commit 3041269ff285685d660a049bfef43f3dab6f8946)
|
|
Resolves: #i114361# provide and accept changed URL...
of embedded graphic file during save (ODF export)
(cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f)
Conflicts:
sw/inc/ndgrf.hxx
sw/source/core/graphic/ndgrf.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/filter/xml/xmltexte.cxx
xmloff/source/draw/shapeexport2.cxx
Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986
(cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d)
Resolves: #i124717# do not mark *.svm graphic files as *.bmp graphic files
(cherry picked from commit a5cfb91f3dc4b38055fb920f65101cc45d52f8de)
Conflicts:
svtools/source/filter/filter.cxx
Change-Id: I43f62a453bfa17254cebc07bde95f07f16a329c2
(cherry picked from commit 12dd68e3d20ad36ebe7cb40a600215f6d2b7b6ec)
Resolves: #i124946# only apply new embedded stream name...
for a graphic, if is already has one.
- needed correction for the fix made for issue #i114361#
(cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9)
Conflicts:
sw/inc/ndgrf.hxx
sw/source/core/graphic/ndgrf.cxx
sw/source/filter/xml/xmltexte.cxx
Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8
(cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d)
Resolves: #i124966# keep picture format information
- <GfxLink> instance - also for the reading of preview picture data
in order to avoid trouble on save in case that the preview data equals the
picture data
(cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366)
Conflicts:
svx/source/svdraw/svdograf.cxx
Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d
(cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72)
Reviewed-on: https://gerrit.libreoffice.org/9455
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I19f10c40151ebfea9b02bfe5df7c31b157188351
|
|
In this particular case, basctl::Shell::onDocumentCreated() and pretty much
everything in basctl/ it seems operate on the current window. The "OnNew"
event that triggers this comes from a timeout generated who knows where
for whatever reason. However, the code "knows" what the current window
is by having basctl::Shell::SetCurWindow() react on events about the current
window changing ... which come from posted events.
So, unless it's defined somewhere that an ordering here must exist, this
is inherently racy. At least generic and Gtk event loops appear to always
deliver the posted event first, so force the same ordering in the KDE
event loop handling.
Change-Id: Ia098f6b45e6b5a5133a12a9172eb09069e6362f9
|
|
Change-Id: I4b3724159be64609f1e88b63ccd9275d164fcb3e
Reviewed-on: https://gerrit.libreoffice.org/9427
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
|
|
E.g. when pasting from terminal you will get "\r\n".
Writer inserts '\r' character into the document as an
invisible character. If you save that to .odt and reload, you will
get ' ' instead. Or when saving to .doc and reload, you will get '\n'.
Change-Id: Id6780bf6d71a8f0a17c1e6ee7a7dcb4d297446dc
(cherry picked from commit 278baa557d18136a2641c015f7077a5838188766)
|
|
...inadvertently left over debug code
Change-Id: I4bb9ee37ee7fd5d7e4e7f91afbcc036ba5802880
|
|
Change-Id: I4ad71bd3538b1d5b033802469b16dd35df5b9724
|
|
Change-Id: I31d24ef32ef4bb9ea4b57d596cccd269d07d91ec
|
|
Change-Id: I4b185f9a0ecaa74ca3f1e93b3bfe504e9778a8ca
|
|
Change-Id: Id115af34011fbedc93a1fea1734ea6b1e7cfafd0
|
|
Change-Id: I523fba14c721815f8416f6e0224e42052d13429a
|