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 1d38cb365543924f9c50014e6b2227e77de1d0c9)
Conflicts:
sd/source/ui/view/sdview3.cxx
xmloff/source/chart/SchXMLExport.cxx
Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a
Reviewed-on: https://gerrit.libreoffice.org/9836
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
The last used color is stored inside
SvxColorToolBoxControl, so we must call its Select method
to do that. (This also fixes using the last shape, See
previous commit for a fix of exactly the same problem in
chart2.)
For the font color, there was also another problem:
The SID used for that button is SID_ATTR_CHAR_COLOR2.
The problem is that SvxColorToolBoxControl::Select
actually calls for that SID the ".uno:CharColorExt"
command instead of ".uno:FontColor" (which activates
in writer the format paintbrush mode). Given that since
commit 584b415924bba22db23a4258062e54973de0ed7c this
command also receives the last used color as argument,
the easiest solution is to register ".uno:CharColorExt"
here as well.
(cherry picked from commit 426033250db0b9b6344980655ca0be59efe6a6a5)
Change-Id: I2db25a7fb537ce10dfec7b1c2d049dd77d9f8f6b
|
|
Change-Id: Ie39f1005182da118475fdf9c4e463bfb902d4446
(cherry picked from commit 16ba360f2a526654cedfcd4cda230442c3a8a522)
|
|
Thus it needs to be saved when it is *false*.
Change-Id: I01bae547afe71ede12fb852c1a9040b7e45bf7b9
Reviewed-on: https://gerrit.libreoffice.org/9502
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
(cherry picked from commit 7b8e9ea4f9645599f45f7e2f708bab2837dafd0d)
Reviewed-on: https://gerrit.libreoffice.org/9505
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done
Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
|
|
Change-Id: I42787db31769e8bde984c5f4f0aa90335e889b1c
Reviewed-on: https://gerrit.libreoffice.org/9356
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
|
|
See http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-td4109071.html
Thank you Lionel!
Change-Id: I999bad0d6de0327bea7ba04a6c61a497d45f53a0
|
|
Change-Id: I7c514b7a1d86f52d77672b826b1f08b825fd7aa7
|
|
3m44s reduced to 53s...
Change-Id: I9a7601e4cb23430b850fe4303e7da877ab1d63e2
|
|
Change-Id: I01ad1f4c3a8e0ee8173ceb147ce20945b7d5433d
|
|
instead of 5 (mostly identical) classes.
Also the following bugs were fixed:
* All pickers now use split buttons. (fdo#45671)
* Color palette now indicates the current color. (fdo#73891)
(Previous changes related to that bug are reverted as part
of this commit.)
* Selecting a color from a float panel now updates the
button. (fdo#77683)
* For Font color/background color in Writer, the color
that is shown on the button, is always the one that's
actually used. (Can be a different color after hiding
the toolbar.)
* For Font color/background color in Writer, the button
now indicates when we're in the format paintbrush mode.
(Removed in 085e8a07e61ef2d3a82e11094d8773ab17cfdb3c
for some reason.)
Change-Id: Idb4829552240c52fb0882aca627c8177bbe2f839
|
|
Change-Id: Ibe0a1006aba2b6cbd87c0bd6ca3acbf9ba7b0fbe
|
|
Change-Id: Ib55bdc21fa6081c55777465115538905c1cab5e0
|
|
Change-Id: I490326abccac237bd70209d2a3dd623ebd5c59a2
|
|
Change-Id: I67acda35fa127547dcea0cd18c9dc16db7c00294
|
|
Change-Id: I82ed4a4868cb22566706ca0f4b1321e0d45016cf
|
|
Change-Id: I2e7676ddec446dfdb72018a1039d6271f963376c
|
|
Change-Id: Ib3e7a51a8b01165d4706857f7b347d622c2e624a
|
|
Add a method
bool IsValueChangedFromSaved()
to the various Button and Listbox classes.
Use it to simplify code like
if ( maBoldAppFont.GetSavedValue() !=
TriState(maBoldAppFont.IsChecked()) )
to
if ( maBoldAppFont.IsValueChangedFromSaved() )
Change-Id: I26b291d0980237497063ee301d63a49c7d2bc227
Reviewed-on: https://gerrit.libreoffice.org/9250
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
...so declare them as such. This avoids the recurring mistake of storing such
IDs as sal_uInt32, truncating in 64 bit environments, causing RemoveUserEvent to
potentially not remove the event, it thus firing "too late" and probably causing
a crash.
While at it, consolidate the trivially unnecessary overloads of both
Application::PostUserEvent and Window::PostUserEvent. And in each of them, it
looks like deleting the mpLink member was missing from the failure branch.
Change-Id: Iab13afbb06e12ac15dec6a6b5b85a7e402a3c654
|
|
Change-Id: I0c581bb48f101a84d0f0c4ceb7b064cff0d509d6
|
|
Change-Id: I7a269dbf163f4c839b6c553c7b096185fe2f8a01
|
|
Change-Id: Ib6add605efa2588ac357185687b22c2a6b8863ca
|
|
Change-Id: I94c4853524eea306dd53a7a747f94735e0be0752
|
|
* mostly fallout from ui conversion
* some completely unused defines from src files
* lots of unused HID ids
Change-Id: I976561205798db3d06ee139de6223f638e58f47a
Reviewed-on: https://gerrit.libreoffice.org/9142
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
|
|
and remove some unused stuff
Change-Id: Iea6177c3d2f9d0668187e66155b62688ae2ecb04
|
|
also remove some commented out code
Change-Id: Ia80c5c57d8d2a74418032de50eee95642cc0969d
|
|
|
|
Change-Id: Ieb1c41481a79ab8713663caee3d5373640ff0ec8
Reviewed-on: https://gerrit.libreoffice.org/9102
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
|
|
Change-Id: I123751e9f08faaccc06649c2f8b29a9a33548312
|
|
Change-Id: I367acc372d6b5996430a2c560e776a469b7e0007
|
|
|
|
|
|
Change-Id: Ieaa787afd7cc622b4750a2ee8f17f6dad934ba63
|
|
Currently .uno:zoom is used for the topmenu and submenu.
Deleting the '...' behind the text will delete it for both,
which is not correct. Therefore I introduce .uno:ZoomMenu for the
topmenu.
Change-Id: I75bcae572be0cca7216c34d81e0b99f4c59c0aab
Reviewed-on: https://gerrit.libreoffice.org/8503
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
|
|
Change-Id: Ibe261cb6b7c91b6a72fc24aef05ef269c69c390f
|
|
i.e. convert "::sal_Bool" to "sal_Bool"
Change-Id: Ie5943aee4fee617bf2670655558927ed25b7e067
|
|
Change-Id: Ida8ee14bb6350fad815d741ca7a2b7db04a8ed11
|
|
Change-Id: I65aa00d79efe15f63c272fbcd5d3e0dea2c28dfc
|
|
Change-Id: I1a91871eb9f1952625b94b15d9ab8a4712487048
|
|
Change-Id: I70cc8c7667d9cfb2fc043e3889c7fb5adc9abd52
|
|
Change-Id: I5c1045253c082a00397cf0f048baee947232c9b1
|
|
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
|
|
Change-Id: Id3d8f4f4ef32280a131907ffa32eb2ad5d6ea2e1
|
|
Change-Id: I64c33ae4c157e270acac9a1f820d3e6272ba0bea
|
|
Change-Id: I1c97da5b7bbac348150399afbf386613433e5551
|
|
Change-Id: I1deb10cb1581137ab92e73367e63339822a9a094
|
|
(cherry picked from commit b635b4fa4e42053d30ab639643d2236a20243f62)
Conflicts:
comphelper/inc/comphelper/TypeGeneration.hxx
comphelper/source/property/TypeGeneration.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/cuitabarea.hxx
cui/source/tabpages/tabarea.cxx
cui/source/tabpages/tabarea.hrc
cui/source/tabpages/tabarea.src
cui/source/tabpages/tparea.cxx
drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
drawinglayer/source/texture/texture.cxx
editeng/inc/editeng/unotext.hxx
editeng/source/items/frmitems.cxx
include/drawinglayer/texture/texture.hxx
include/editeng/brushitem.hxx
include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
include/svx/svxids.hrc
include/xmloff/xmltypes.hxx
reportdesign/source/ui/misc/UITools.cxx
sc/source/ui/drawfunc/drawsh.cxx
sfx2/source/dialog/tabdlg.cxx
svl/source/undo/undo.cxx
svx/inc/svx/unoshprp.hxx
sw/Library_sw.mk
sw/inc/doc.hxx
sw/inc/format.hxx
sw/inc/frmfmt.hxx
sw/inc/swatrset.hxx
sw/inc/unomap.hxx
sw/inc/unoprnms.hxx
sw/source/core/access/accpara.cxx
sw/source/core/attr/format.cxx
sw/source/core/attr/swatrset.cxx
sw/source/core/doc/docdraw.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/atrfrm.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/text/inftxt.cxx
sw/source/core/text/porfld.cxx
sw/source/core/text/txtfly.cxx
sw/source/core/txtnode/fntcache.cxx
sw/source/core/uibase/app/docst.cxx
sw/source/core/uibase/app/docstyle.cxx
sw/source/core/uibase/shells/drawdlg.cxx
sw/source/core/uibase/shells/frmsh.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unomap.cxx
sw/source/core/unocore/unoprnms.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/ui/fmtui/tmpdlg.cxx
sw/source/ui/fmtui/tmpdlg.src
sw/source/ui/frmdlg/frmdlg.cxx
sw/source/ui/frmdlg/frmpage.src
sw/source/ui/inc/frmsh.hxx
xmloff/source/text/txtprhdl.cxx
xmloff/source/text/txtprmap.cxx
Change-Id: Id3ffaa83bb5594d287f1ac8f2c1c9cf55c70946d
|
|
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
|