Age | Commit message (Collapse) | Author |
|
(cherry picked from commit 710925d1d93a8ccf36957fa2f4d98d7dedb4cb9f)
Conflicts:
extras/source/palettes/standard.soc
svx/inc/svx/dialogs.hrc
svx/source/dialog/sdstring.src
svx/source/unodraw/unoprov.cxx
svx/source/xoutdev/xtabcolr.cxx
Change-Id: I15899fc51e61e29da443838d1a42ea5d7c53acb9
|
|
Conflicts:
sw/UIConfig_swriter.mk
Conflicts:
sw/source/ui/chrdlg/drpcps.cxx
Change-Id: Ic66f367d23b84666dd0165108c405b5b625b798b
Reviewed-on: https://gerrit.libreoffice.org/4236
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I073fe30127fcf0b97656198f55197d9533f44f55
|
|
It is better than renaming Blue 9 to Blue nine in order to avoid name clash.
Change-Id: I6c336a617c8c6b92f86cc45bcf2763e843c3ca4d
|
|
(cherry picked from commit bea9a9501814bdbc342a2adfa57019704260a532)
Conflicts:
extras/source/gallery/gallery_system/sg10.sdg
extras/source/gallery/gallery_system/sg10.thm
extras/source/gallery/gallery_system/sg12.sdg
extras/source/gallery/gallery_system/sg12.sdv
extras/source/gallery/gallery_system/sg12.thm
extras/source/gallery/gallery_system/sg16.sdv
extras/source/gallery/gallery_system/sg17.sdg
extras/source/gallery/gallery_system/sg17.thm
extras/source/gallery/gallery_system/sg19.sdg
extras/source/gallery/gallery_system/sg19.sdv
extras/source/gallery/gallery_system/sg19.thm
extras/source/gallery/gallery_system/sg2.sdv
Change-Id: I4c2e34c470b05ddae5923e782c31d15aa4961e0d
|
|
Conver Paragraph Alignment and Indent & Spacing to widget UI.
Change-Id: Ib3b7d76a63bd677d5d94f7385bbf589f18eceeda
Reviewed-on: https://gerrit.libreoffice.org/4047
Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ia89a076e105791100d55d93e703168677fd2ef54
|
|
Change-Id: I5ee490c4d08e703b5ed825d2d4d0c981e21a1b9f
|
|
Change-Id: If34cef7eef5ab26f52420685f54a85fcff2a0c12
|
|
i.e. restore e206f8b7a2882d7eea163e29d76dfb336113e3f7
Change-Id: I9c9647ae9e42bcb09a6acd8755bcb170006818f0
|
|
to solve the conflict
(cherry picked from commit 81c3404d82cb72b9d183e2b38034334e9b65fd22)
Change-Id: Ic368478dac25d9dce8e7c80bd3a7a33fdc68f3b0
|
|
in the task and discussed on the list under '[proposal] Adopt palette to
Symphony palette partially', also corrected typos on gradient
definitions
(cherry picked from commit 57811cc1cd5e49c1e87fb2a9d79f8a3941a025e3)
Conflicts:
extras/source/palettes/standard.soc
Change-Id: I54fa27963f7c9732211b7bded5a343b9c05449ab
|
|
(cherry picked from commit 687205925cf94cff2daeb6e399ea7b05fd8213dd)
Change-Id: I6a24d55471fe56175ce1bd8358e6a433f3940e78
|
|
(cherry picked from commit 753df696b003b6046a0444abc48a87e14de1ff33)
Change-Id: I1887c2cdb5d4c0b179952fe1f302b80506366757
|
|
Change-Id: Ie6b86a2a48e6697f816e9975b6e34491ab0ad17e
|
|
Change-Id: Ic269107fd842950f881adc5a62783e55889cf742
|
|
Change-Id: I61db7bf0def96209a85656128188f85899b72292
|
|
Change-Id: Iab0028ad1bfd8a841a3cf87aadbe0dc9d9ad830e
|
|
Change-Id: Ic390ceeb9f52953d5dea6999b194956e90eb4629
|
|
Change-Id: I9037aa31cbb93d38a656ce463e0a73f8b39245ff
|
|
Change-Id: Ib7dffdb36d09d458e3c6089d1d0a16cd5ee63afd
|
|
Change-Id: Ia9f0e7196ce858e664e9a735ab55c34c5937bd1a
|
|
Change-Id: If5fe5af925bb2f8b7a5a11eb9d310668a3fd7085
|
|
Change-Id: I95402d81aef426de14ca928ea811aac6f1cd289d
|
|
Further gnumake fixups, package the files in the Gallery rules.
Change-Id: Icda2de9cfcd2ff573db2e9ab27e2670dcfa5f0a8
|
|
Change-Id: Idec88df28724bcf4b3145bb169fa0fe08a8e282a
|
|
Change-Id: Ia45a2eed7104b376b92290e1a40219e8988d927b
|
|
Change-Id: I03fbfb173958c4d9e1e917f0d098ea8930d6041d
|
|
Change-Id: I9ec5192c007df6d0ce15f5e61cb53cf6ea04db08
|
|
Change-Id: I024bfa537360339befdc67a2fa2b51b15d9c3611
|
|
Change-Id: Ibbf8f1f8b1590af461dfa5885adb1027580f8f15
|
|
Change-Id: Ia2914e24f03cdb3f24df30bf203a09d18f4a8fd4
|
|
Change-Id: I488def80e855624ffd85a0b6c4cc19819c39ed01
|
|
Change-Id: I26465f69a7fa50fa58643c00225376a82ba8a7fc
|
|
Change-Id: Ifb216d9efc593e7ecbc9d47b09aed83ab7b2ec39
|
|
List of abbreviations is from https://is.wiktionary.org/wiki/Flokkur:%C3%8Dslenskar_skammstafanir
Change-Id: Icaf8f611d0ceb46774e580ac1e8c3a57e786c28b
Reviewed-on: https://gerrit.libreoffice.org/3862
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: I31cd2e9a2a3f1606596a4e681cea07659463d2f1
|
|
because libreoffice inserted a bunch of extra resources since fork point.
We should get rid of these ids entirely and e.g. at least instead use the
filename number as the the id instead which would be a little less painful.
Change-Id: I5d0a3b5e60dbe448164bdff25d46171a1ed4d55e
(cherry picked from commit 8e9bcdb73adf7b544299bb57fcce5423b43cc058)
|
|
(cherry picked from commit cf417aec41decab94b5f1e82f6409e97a6c02fb5)
Conflicts:
extras/source/gallery/gallery_system/sg2.sdg
extras/source/gallery/gallery_system/sg2.thm
svx/inc/galtheme.hrc
svx/inc/svx/fontworkgallery.hxx
svx/inc/svx/gallery.hxx
svx/inc/svx/galtheme.hxx
svx/source/gallery2/galctrl.cxx
svx/source/gallery2/galexpl.cxx
svx/source/gallery2/galobj.cxx
svx/source/tbxctrls/fontworkgallery.cxx
vcl/inc/vcl/outdev.hxx
vcl/source/gdi/outdev6.cxx
Change-Id: I519a2cf4e16bb42ecfd9c4b48094e65adcc35599
(cherry picked from commit ddec662e8dc234b7196c1b3c28db5da743557ec6)
|
|
because I need to get the following patch to apply :-(
This reverts commit 2056f718b5f000bdddeb68cc17592497f6baea1a.
Change-Id: I3b005725a826d0339a6d1bb8d211959cd03c7d6e
(cherry picked from commit 58a2d079400d6a6170b512b7fa387a7152849463)
|
|
and additions of new themes
(cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c)
Conflicts:
extras/prj/build.lst
extras/source/gallery/bullets/makefile.mk
extras/source/gallery/gallery_system/sg2.sdg
extras/source/gallery/gallery_system/sg2.sdv
extras/source/gallery/gallery_system/sg2.thm
extras/util/target.pmk
scp2/source/ooo/directory_ooo.scp
scp2/source/ooo/file_extra_ooo.scp
svx/inc/galtheme.hrc
svx/source/gallery2/gallery1.cxx
svx/source/gallery2/galobj.cxx
svx/source/gallery2/galtheme.src
vcl/inc/vcl/alpha.hxx
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/bitmapex.hxx
vcl/source/gdi/alpha.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmap3.cxx
vcl/source/gdi/bitmapex.cxx
(cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f)
Conflicts:
vcl/source/gdi/bitmap3.cxx
Change-Id: If4b2397b889f914487f2135679250c175181e1df
|
|
|
|
Change-Id: Ib092623501e36fa759a5215a435d21e1fea8dfdd
|
|
Tango icons are in its own tango.soc palette. No
need to add them to the standard palette.
This reverts commit b9c98414ec9084cf97b5dcc911fb9941b5e57ebb.
Change-Id: Id19d869ce8744cf55e64f4d003b8011f9df0023f
Reviewed-on: https://gerrit.libreoffice.org/3738
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
|
|
Change-Id: I27d96030aed3866c0d384a28598e292cb4ab3a04
|
|
Change-Id: Icba78537cd1f2bf2c83564bb65a5167a20a76e90
|
|
Change-Id: I2555dc113b2fb4c77bec187b15f0bb545811b07b
|
|
Change-Id: I6728162db244971f115754cfb9f55bbafd42f6d5
|
|
Change-Id: I7467b0d9f32c0a006bedf88f6658ffffcd28db5f
|
|
Change-Id: Iffefd61167bf46aef4791aa3c09d4a78ae79dd92
|